Merge remote-tracking branch 'origin/master'

src/main/java/cn/wisenergy/chnmuseum/party/common/enums/LanguageEnum.java

@@ -2,11 +2,11 @@ package cn.wisenergy.chnmuseum.party.common.enums;
 
 public enum LanguageEnum {
 
-    CHINESE("Chinese", "汉语"),
-    MONGOLIAN("Mongolian", "蒙语"),
-    TIBETAN("Tibetan", "藏语"),
-    UYGHUR("Uyghur", "维吾尔语"),
-    ENGLISH("English", "英语");
+    zh("Chinese", "汉语"),
+    mn("Mongolian", "蒙语"),
+    bo("Tibetan", "藏语"),
+    uyg("Uyghur", "维吾尔语"),
+    en("English", "英语");
 
     // 错误编码
     private String code;

src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -15,6 +15,7 @@ import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import javassist.util.HotSwapper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -60,7 +61,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
     public TUser getCurAdmin(HttpServletRequest request) {
         String header = request.getHeader("Authorization");
         if (StringUtils.isBlank(header)) {
-            return null;
+            throw new AuthenticationException("token失效,请重新登录");
         }
         String username = JwtTokenUtil.getUsername(header);
         TUser user = userService.selectByUsername(username);
@@ -89,7 +90,15 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
                 .getRequestAttributes()).getRequest();
         MethodLog methodLog = getAnnotationLog(point);
         String ip = getIp(request);
-        TUser user = getCurAdmin(request);
+        TUser user = null;
+        try {
+            user = getCurAdmin(request);
+        } catch (Exception e) {
+            HashMap<Object, Object> resultMap = new HashMap<>();
+            resultMap.put("resultCode", "500");
+            resultMap.put("message", e.getMessage());
+            return resultMap;
+        }
 //        if (user==null){
 //            HashMap<String, Object> resultMap = new HashMap<>();
 //            resultMap.put("resultCode", "500");

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -73,7 +73,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
         auditPage.setSize(page.getSize());
         //条件
         QueryWrapper<Audit> ew = new QueryWrapper<Audit>()
-                .eq("a.level", auditStatusLevel.name())
+                //暂时注掉
+//                .eq("a.level", auditStatusLevel.name())
                 .eq("a.type", type.name())
                 .orderByDesc("a.create_time", "a.id");
         //

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

@@ -66,6 +66,7 @@ public class AuditController extends BaseController {
     public Map<String, Object> getUserList(String name, String status, String level) {
         Page<Audit> auditList;
         try {
+            TUser user1 = getcurUser();
             TUser user = new TUser();
             if (StringUtils.isNotBlank(name)) {
                 user.setUserName(name);
@@ -76,6 +77,12 @@ public class AuditController extends BaseController {
             if (StringUtils.isNotBlank(level)) {
                 user.setAuditStatus(level);
             }
+            //如果是账号禁用初审员，设置层级为初审
+            if (user1.getRoleList().contains("15")){
+                user.setAuditStatus(AuditStatusEnum.TBC.name());
+            }else{
+                user.setAuditStatus(AuditStatusEnum.TBCA.name());
+            }
             auditList = auditService.getUserList(getPage(), user);
             return getResult(auditList);
         } catch (Exception e) {
@@ -149,48 +156,48 @@ public class AuditController extends BaseController {
         return getFailResult();
     }
 
-    @GetMapping("/getList")
-    @RequiresPermissions("/audit/getList")
-    @ApiOperation(value = "获取禁用审核全部列表(无分页)", notes = "获取禁用审核全部列表(无分页)")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
-    })
-    public Map<String, Object> getAuditList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
-        List<Audit> auditList = auditService.list();
-        return getResult(auditList);
-    }
-
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
-    })
-    @PostMapping("/getPageList")
-    @RequiresPermissions("/audit/getPageList")
-    @ApiOperation(value = "获取禁用审核分页列表", notes = "获取禁用审核分页列表")
-    public Map<String, Object> getAuditPageList(GenericPageParam genericPageParam) {
-        LambdaQueryWrapper<Audit> queryWrapper = new LambdaQueryWrapper<>();
-        // 对名称或编码模糊查询
-        if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
-            queryWrapper.like(Audit::getContent, genericPageParam.getNameOrCode());
-        }
-        // 根据创建时间区间检索
-        if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
-            queryWrapper.ge(Audit::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
-                    .le(Audit::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
-        }
-        // 设置排序规则
-        queryWrapper.orderByDesc(Audit::getCreateTime);
-        // 设置查询内容
-        queryWrapper.select(
-                Audit::getId,
-                Audit::getContent,
-                Audit::getCreateTime);
-        Page<Audit> page = this.auditService.page(getPage(), queryWrapper);
-        return getResult(page);
-    }
+//    @GetMapping("/getList")
+//    @RequiresPermissions("/audit/getList")
+//    @ApiOperation(value = "获取禁用审核全部列表(无分页)", notes = "获取禁用审核全部列表(无分页)")
+//    @ApiImplicitParams(value = {
+//            @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
+//    })
+//    public Map<String, Object> getAuditList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
+//        List<Audit> auditList = auditService.list();
+//        return getResult(auditList);
+//    }
+//
+//    @ApiImplicitParams(value = {
+//            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
+//            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
+//            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
+//            @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
+//            @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
+//    })
+//    @PostMapping("/getPageList")
+//    @RequiresPermissions("/audit/getPageList")
+//    @ApiOperation(value = "获取禁用审核分页列表", notes = "获取禁用审核分页列表")
+//    public Map<String, Object> getAuditPageList(GenericPageParam genericPageParam) {
+//        LambdaQueryWrapper<Audit> queryWrapper = new LambdaQueryWrapper<>();
+//        // 对名称或编码模糊查询
+//        if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
+//            queryWrapper.like(Audit::getContent, genericPageParam.getNameOrCode());
+//        }
+//        // 根据创建时间区间检索
+//        if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
+//            queryWrapper.ge(Audit::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
+//                    .le(Audit::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
+//        }
+//        // 设置排序规则
+//        queryWrapper.orderByDesc(Audit::getCreateTime);
+//        // 设置查询内容
+//        queryWrapper.select(
+//                Audit::getId,
+//                Audit::getContent,
+//                Audit::getCreateTime);
+//        Page<Audit> page = this.auditService.page(getPage(), queryWrapper);
+//        return getResult(page);
+//    }
 
     @ApiOperation(value = "获取禁用审核详情", notes = "获取禁用审核详情")
     @GetMapping("/getById")
@@ -221,20 +228,44 @@ public class AuditController extends BaseController {
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "status", value = "待初审：TBC, 驳回：REFUSED,待复审：TBCA, 通过：APPROVED_FINAL", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "level", value = "审核级别：TBC,TBCA", paramType = "query", dataType = "String", required = true),
             @ApiImplicitParam(name = "type", value = "视频内容：ASSET,展板内容：EXHIBITION_BOARD,学习内容：LEARNING_CONTENT", paramType = "query", dataType = "String", required = true)
     })
     public Map<String, Object> getPageAllList(String name, String status,
-                                              @NotBlank(message = "level参数不能为空") String level,
                                               @NotBlank(message = "type参数不能为空") String type) {
+
         //分页
         Page<Object> page = getPage();
         AuditStatusEnum auditStatus = null;
-        AuditStatusEnum auditStatusLevel = AuditStatusEnum.valueOf(level);
+        AuditStatusEnum auditStatusLevel = null;
         AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type);
 
-        if (auditTypeEnum == null || auditStatusLevel == null) {
-            return getFailResult("type或level参数不正确");
+//        TUser user = getcurUser();
+//        switch (auditTypeEnum){
+//            case ASSET:
+//                if (user.getRoleList().contains("9")){
+//                    auditStatusLevel=AuditStatusEnum.TBC;
+//                }else {
+//                    auditStatusLevel=AuditStatusEnum.TBCA;
+//                }
+//                break;
+//            case EXHIBITION_BOARD:
+//                if (user.getRoleList().contains("11")){
+//                    auditStatusLevel=AuditStatusEnum.TBC;
+//                }else {
+//                    auditStatusLevel=AuditStatusEnum.TBCA;
+//                }
+//                break;
+//            case LEARNING_CONTENT:
+//                if (user.getRoleList().contains("13")){
+//                    auditStatusLevel=AuditStatusEnum.TBC;
+//                }else {
+//                    auditStatusLevel=AuditStatusEnum.TBCA;
+//                }
+//                break;
+//
+//        }
+        if (auditTypeEnum == null) {
+            return getFailResult("type参数不正确");
         }
         if (StringUtils.isNotBlank(status)) {
             auditStatus = AuditStatusEnum.valueOf(status);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -64,7 +64,7 @@ public class TBoxOperationController extends BaseController {
         //设置数据权限
         if (StringUtils.isNotBlank(user1.getAreaId())) {
             String areaId1 = getAreaId(user1.getAreaId());
-            user.setAreaName(getAreaId(areaId1));
+            user.setAreaName(areaId1);
         }
         user.setOrgCode(user1.getOrgCode());
         try {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/base/BaseController.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -189,6 +190,8 @@ public class BaseController implements Serializable {
             if (authorization.startsWith("Bearer ")) {
                 authorization = authorization.substring(7);
             }
+        }else {
+            throw new AuthenticationException("token失效,请重新登录");
         }
         return JwtTokenUtil.getEmployeeId(authorization);
     }
@@ -204,6 +207,8 @@ public class BaseController implements Serializable {
             if (authorization.startsWith("Bearer ")) {
                 authorization = authorization.substring(7);
             }
+        }else {
+            throw new AuthenticationException("token失效,请重新登录");
         }
         return JwtTokenUtil.getUsername(authorization);
     }