Commit e7fac3de authored by 赵啸非's avatar 赵啸非

修改本月统计

parent c6a3afb1
...@@ -6,11 +6,13 @@ import com.mortals.framework.common.Rest; ...@@ -6,11 +6,13 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.framework.utils.ServletUtils; import com.mortals.framework.utils.ServletUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.keys.RedisCacheKeys;
import com.mortals.xhx.module.attendance.model.AttendanceClassEntity; import com.mortals.xhx.module.attendance.model.AttendanceClassEntity;
import com.mortals.xhx.module.attendance.model.AttendanceExportRecordEntity; import com.mortals.xhx.module.attendance.model.AttendanceExportRecordEntity;
import com.mortals.xhx.module.attendance.model.AttendanceGroupEntity; import com.mortals.xhx.module.attendance.model.AttendanceGroupEntity;
...@@ -65,6 +67,8 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro ...@@ -65,6 +67,8 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
private AttendanceGroupService groupService; private AttendanceGroupService groupService;
@Autowired @Autowired
private AttendanceClassService classService; private AttendanceClassService classService;
@Autowired
private ICacheService cacheService;
public AttendanceRecordHikController() { public AttendanceRecordHikController() {
super.setModuleDesc("海康考勤打卡记录汇总信息"); super.setModuleDesc("海康考勤打卡记录汇总信息");
...@@ -183,6 +187,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro ...@@ -183,6 +187,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
} else { } else {
query.getOrderColList().add(new OrderCol("attendanceDate", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("attendanceDate", OrderCol.DESCENDING));
} }
boolean bool = cacheService.set(RedisCacheKeys.getHikExportLockKey(), "111", 120L);
if (!bool) {
throw new AppException("考勤数据正在导出中,请稍后再试!");
}
} }
@Override @Override
...@@ -222,7 +233,9 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro ...@@ -222,7 +233,9 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
attendanceExportRecordEntity.setType(1); attendanceExportRecordEntity.setType(1);
attendanceExportRecordEntity.setExportOrImport(1); attendanceExportRecordEntity.setExportOrImport(1);
attendanceExportRecordService.save(attendanceExportRecordEntity); attendanceExportRecordService.save(attendanceExportRecordEntity);
super.doExportFileAfter(data, query, context);
cacheService.del(RedisCacheKeys.getHikExportLockKey());
} }
} }
...@@ -17,5 +17,10 @@ public final class RedisCacheKeys { ...@@ -17,5 +17,10 @@ public final class RedisCacheKeys {
public static String getCoopsDistributedLockKey() { public static String getCoopsDistributedLockKey() {
return "coops:distributed:lock"; return "coops:distributed:lock";
} }
public static String getHikExportLockKey() {
return "hik:export:lock";
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment