审核鬓发控制

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -207,20 +207,22 @@ public class AuditController extends WebBaseController{
 		if (null == loginStaffDTO) {
 			return resultResponse(HaoBanErrCode.ERR_4);
 		}
-		Object o = RedisUtil.getCache("audit-"+auditId);
-		if(o != null){
-			log.info("请不要过于频繁点击");
-			return resultResponse(HaoBanErrCode.ERR_10008);
-		}
-		//设置缓存10秒
-		RedisUtil.setCache("audit-"+auditId, "1",10L);
+
 		String staffId = login.getStaffDTO().getStaffId();
 		String staffName = login.getStaffDTO().getStaffName();
 		if(StringUtils.isAnyBlank(auditId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		String result = auditApiService.audit("",auditId,staffName,staffId);
-		if(StringUtils.isEmpty(result)){
+        String key = "audit-" + auditId;
+        RedisUtil.lock(key, 10L);
+        AuditDTO audit = auditApiService.findById(auditId);
+        if (audit == null || audit.getAuditStatus() != 0) {
+            RedisUtil.unlock(key);
+            return resultResponse(HaoBanErrCode.ERR_10017);
+        }
+        String result = auditApiService.audit("",auditId,staffName,staffId);
+        RedisUtil.unlock(key);
+        if(StringUtils.isEmpty(result)){
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}else{
 			HaoBanErrCode errCode= HaoBanErrCode.ERR_DEFINE;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 
+import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -192,9 +193,12 @@ public class AuditController extends WebBaseController{
 		if(auditStatus == null){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		
+		String key = "audit-" + auditId;
+		RedisUtil.lock(key, 10L);
+
 		AuditDTO audit = auditApiService.findById(auditId);
-		if(audit == null){
+		if (audit == null || audit.getAuditStatus() != 0) {
+			RedisUtil.unlock(key);
 			return resultResponse(HaoBanErrCode.ERR_10017);
 		}
 		StaffDTO staff = staffApiService.selectById(staffId);
@@ -282,6 +286,7 @@ public class AuditController extends WebBaseController{
 			audit.setAuditStatus(3);
 		}
 		auditApiService.update(audit);
+		RedisUtil.unlock(key);
 		return resultResponse(HaoBanErrCode.ERR_1);
 		
 	}