From 336d113220f675976f864ad3eab7df7cd432808d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 01 五月 2026 08:35:43 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index e734dbc..5131c19 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -20,9 +20,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.quartz.task.RyTask;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserDeptService;
import com.smartor.domain.*;
+import com.smartor.domain.VO.HeLibraryCountVO;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.VO.ServiceSubtaskVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -76,6 +78,9 @@
@Autowired
private ISysConfigService configService;
+
+ @Autowired
+ private RyTask ryTask;
@Value("${spring.profiles.active}")
private String active;
@@ -175,7 +180,7 @@
if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
redisFlag = true;
map = redisMap;
- redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
+ redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
}
}
if (!redisFlag) {
@@ -242,13 +247,12 @@
//@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/patItemByCondition")
- public TableDataInfo patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ public Map<String, Object> patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
List<ServiceSubtask> serviceSubtaskList = null;
ServiceSubtaskEntity serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class);
serviceSubtaskEntity.setContinueContent(ObjectUtils.isNotEmpty(serviceSubtaskVO.getContinueContent()) ? serviceSubtaskVO.getContinueContent().toString() : null);
if (serviceSubtaskEntity != null) {
- PageUtils.startPageByPost(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize());
-
+ serviceSubtaskEntity.setPageNum(PageUtils.getOffset(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize()));
serviceSubtaskList = serviceSubtaskService.patItem2(serviceSubtaskEntity);
}
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -273,7 +277,7 @@
serviceSubtaskService.patItem2(serviceSubtaskEntity);
}
});
- return getDataTable2(total, list);
+ return getDataTable3(total, list);
}
/**
@@ -515,17 +519,23 @@
@ApiOperation("鑾峰彇闅忚缁熻姣斾緥")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatistics")
- public AjaxResult getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ public Map<String, Object> getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
}
+ Integer offset = PageUtils.getOffset(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
+ serviceSubtaskCountReq.setPageNum(offset);
+
String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle", serviceSubtaskCountReq.getOrgid());
if (ObjectUtils.isNotEmpty(followUpCountStyle)) {
serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle);
} else {
serviceSubtaskCountReq.setFollowUpCountStyle("1");
}
- return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
+ serviceSubtaskCountReq.setPageNum(null);
+ serviceSubtaskCountReq.setPageSize(null);
+ List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq);
+ return getDataTable4(CollectionUtils.isEmpty(sfStatistics) ? sfStatistics.size() : 0, serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
}
/**
@@ -574,6 +584,25 @@
return success(serviceStatistics);
}
+ /**
+ * 闅忚寮傚父缁熻瀵煎嚭-搴熸 鏆傛椂涓嶄娇鐢�
+ */
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
+ @Log(title = "闅忚缁熻瀵煎嚭", businessType = BusinessType.EXPORT)
+ @PostMapping("/getSfStatisticsIsAbnormalExport")
+ public void getSfStatisticsIsAbnormalExport(HttpServletResponse response, ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ List<ServiceSubtaskIsAbnormalStatistic> sfStatistics = serviceSubtaskService.getSfStatisticsIsAbnormalExport(serviceSubtaskCountReq);
+ ExcelUtil<ServiceSubtaskIsAbnormalStatistic> util = new ExcelUtil<ServiceSubtaskIsAbnormalStatistic>(ServiceSubtaskIsAbnormalStatistic.class);
+ String sheetName = "";
+ String fileName = "";
+ if (active.equals("ls") || active.equals("druid")) {
+ fileName = sheetName = LocalDate.now().getMonthValue() + "鏈堝嚭闄㈤殢璁垮紓甯哥粺璁¤〃";
+ util.exportExcelWithFileName(response, sfStatistics, sheetName, fileName);
+ } else {
+ sheetName = "闅忚寮傚父缁熻瀵煎嚭";
+ util.exportExcel(response, sfStatistics, sheetName);
+ }
+ }
/**
* 鑾峰彇闅忚缁熻姣斾緥
@@ -587,7 +616,6 @@
}
return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq));
}
-
/**
@@ -607,9 +635,6 @@
}
return success(serviceSubtaskService.getContinueNurseCount(serviceSubtaskCotinueCountVO));
}
-
-
-
/**
@@ -728,5 +753,16 @@
return map;
}
+ @ApiOperation("鑾峰彇褰撳墠鐢ㄦ埛瀹ｆ暀鏁伴噺缁熻")
+ @PostMapping("/gethelibraryCount")
+ public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO) {
+ log.info("鑾峰彇褰撳墠鐢ㄦ埛瀹ｆ暀鏁伴噺缁熻鐨勫叆鍙備负锛歿}", heLibraryCountVO);
+ return serviceSubtaskService.getHeLibraryCount(heLibraryCountVO);
+ }
+
+ @PostMapping("/test")
+ public void test() {
+ ryTask.longTaskSend();
+ }
}
--
Gitblit v1.9.3