apmDayList);
+ /**
+ * 统计所有违约预约记录, 查询条件: blacklistFlag = 0 and apmTime < DateUtil.now() and apmStatus in [0, 2]
+ *
+ * 按预约人分组
+ *
+ * @return
+ */
+ List> getRenegedCountList();
}
diff --git a/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml b/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
index 2180f32..6af2128 100644
--- a/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
@@ -48,6 +48,9 @@
and ar.cup_card_no like concat(concat('%', #{cupCardNo}), '%')
+
+ and ar.project like concat(concat('%', #{project}), '%')
+
+
+
diff --git a/src/main/java/org/springblade/modules/business/service/IApmRecordService.java b/src/main/java/org/springblade/modules/business/service/IApmRecordService.java
index 99839d5..d2d8ac3 100644
--- a/src/main/java/org/springblade/modules/business/service/IApmRecordService.java
+++ b/src/main/java/org/springblade/modules/business/service/IApmRecordService.java
@@ -30,11 +30,20 @@ public interface IApmRecordService extends BaseService {
* @param cupCardNo
* @return
*/
- IPage selectPage(IPage page, Long createDept, String startTime, String endTime, String cupCardNo);
+ IPage selectPage(IPage page, Long createDept, String startTime, String endTime, String cupCardNo, String project);
String checkApmRecordSave(List apmRecordList);
List countAmpNum(Long createDept, String apmDay);
List countAmpNum(Long createDept, List apmDayList);
+
+ /**
+ * 统计所有违约预约记录, 查询条件: blacklistFlag = 0 and apmTime < DateUtil.now() and apmStatus = 2
+ *
+ * 按预约人分组
+ *
+ * @return
+ */
+ List> getRenegedCountList();
}
diff --git a/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java
index 1f1c7f3..5676f5e 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java
@@ -3,6 +3,8 @@ package org.springblade.modules.business.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.common.cache.DictBizCache;
import org.springblade.common.constant.BusinessConstant;
import org.springblade.common.utils.CommonDateUtil;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -165,10 +167,13 @@ public class ApmConfigServiceImpl extends BaseServiceImpl configList = new ArrayList<>();
for (String day : dayList) {
- Date configApmDay = DateUtil.parse(day + BusinessConstant.DATE_STR_HMS, DateUtil.PATTERN_DATETIME);
+ Date configApmDay = DateUtil.parse(day + BusinessConstant.DATE_STR_DAY_START_HMS, DateUtil.PATTERN_DATETIME);
int subDays = CommonDateUtil.daysBetween(DateUtil.now(), configApmDay);
if (subDays < configSubDays) {
return "保存失败, 只能保存" + configSubDays + "天之后的放号配置";
@@ -189,7 +194,7 @@ public class ApmConfigServiceImpl extends BaseServiceImpl alreadyConfMap = new HashMap<>();
if (Func.isNotEmpty(alreadyConfList)) {
- alreadyConfMap = alreadyConfList.stream().collect(Collectors.toMap(
- config -> config.getProject() + config.getApmDay() + config.getProject() + config.getTimeFrame(), Function.identity()
- ));
+ for (ApmConfig config : alreadyConfList) {
+ String key = config.getProject() + config.getApmDay() + config.getProject() + config.getTimeFrame();
+ if (alreadyConfMap.containsKey(key)){
+ continue;
+ }
+ alreadyConfMap.put(key, config);
+ }
List records = recordService.countAmpNum(createDept, daySearchList);
if (Func.isEmpty(records)) {
@@ -214,7 +223,7 @@ public class ApmConfigServiceImpl extends BaseServiceImpl apmDayList, List projectList) {
+ String apmDayStr = "('" + String.join("', '", apmDayList) + "')";
+ String projectStr = "('" + String.join("', '", projectList) + "')";
- saveBatch(configList);
+ System.out.println("==========================================");
+ System.out.println(apmDayStr);
+ System.out.println(projectStr);
+ System.out.println("==========================================");
+ baseMapper.deleteConfig(createDept, apmDayStr, projectStr);
}
}
diff --git a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java
index 9398f6e..b4ab121 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java
@@ -3,6 +3,7 @@ package org.springblade.modules.business.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.springblade.common.cache.DictBizCache;
import org.springblade.common.constant.BusinessConstant;
import org.springblade.common.enums.ErrorMsgEnum;
import org.springblade.common.utils.CommonDateUtil;
@@ -24,6 +25,7 @@ import org.springblade.modules.system.service.IDictService;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -39,8 +41,8 @@ public class ApmRecordServiceImpl extends BaseServiceImpl selectPage(IPage page, Long createDept, String startTime, String endTime, String cupCardNo) {
- List recordList = baseMapper.selectPage(page, createDept, startTime, endTime, cupCardNo);
+ public IPage selectPage(IPage page, Long createDept, String startTime, String endTime, String cupCardNo, String project) {
+ List recordList = baseMapper.selectPage(page, createDept, startTime, endTime, cupCardNo, project);
return page.setRecords(ApmRecordWrapper.build().listVO(recordList));
}
@@ -51,7 +53,7 @@ public class ApmRecordServiceImpl extends BaseServiceImpl countAmpNum(Long createDept, String apmDay) {
- return baseMapper.countAmpNum(createDept, apmDay);
+// String[] days = {apmDay};
+ return baseMapper.countAmpNumWithDays(createDept, Arrays.asList(apmDay));
}
@Override
@@ -86,4 +89,9 @@ public class ApmRecordServiceImpl extends BaseServiceImpl> getRenegedCountList() {
+ return baseMapper.getRenegedCountList();
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/business/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ArticleServiceImpl.java
index 886c005..f15ece0 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/ArticleServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.common.constant.BusinessConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.business.entity.Article;
import org.springblade.modules.business.mapper.ArticleMapper;
@@ -56,7 +57,8 @@ public class ArticleServiceImpl extends BaseServiceImpl
baseMapper.updatePublishSta(articleCheck.getId(), BusinessConstant.ARTICLE_STATUS_CANCEL);
}
- article.setPublishSta(BusinessConstant.ARTICLE_STATUS_CANCEL + "");
+ article.setPublishSta(BusinessConstant.ARTICLE_STATUS_PUBLISH + "");
+ article.setPublishTime(DateUtil.now());
saveOrUpdate(article);
return true;
}
diff --git a/src/main/java/org/springblade/modules/business/timer/BlacklistTimerJob.java b/src/main/java/org/springblade/modules/business/timer/BlacklistTimerJob.java
new file mode 100644
index 0000000..da6f11b
--- /dev/null
+++ b/src/main/java/org/springblade/modules/business/timer/BlacklistTimerJob.java
@@ -0,0 +1,93 @@
+package org.springblade.modules.business.timer;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springblade.common.cache.DictBizCache;
+import org.springblade.common.constant.BusinessConstant;
+import org.springblade.common.utils.CommonDateUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.modules.business.entity.ApmRecord;
+import org.springblade.modules.business.entity.Blacklist;
+import org.springblade.modules.business.service.IApmRecordService;
+import org.springblade.modules.business.service.IBlacklistService;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 黑名单定时任务处理
+ *
+ * @author Administrator
+ */
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class BlacklistTimerJob extends QuartzJobBean {
+ private final IBlacklistService blacklistService;
+ private final IApmRecordService recordService;
+
+ @Override
+ protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+ addToBlacklist();
+ }
+
+ /**
+ * 添加黑名单
+ */
+ public void addToBlacklist() {
+ // 获取配置的加入黑名单违约次数
+ int configRenegedTimes = DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_RENEGED_TIMES_TO_BLACKLIST);
+
+ // 1. 查询所有违约预约记录, 查询条件: blacklistFlag = 0 and apmTime < DateUtil.now() and apmStatus = 2
+ // 2. 若未记录的违约记录 >= renegedTimes, 添加黑名单, 更新违约记录的 blacklistFlag = 1
+ List renegedList = recordService.list(Wrappers.lambdaQuery()
+ .eq(ApmRecord::getBlacklistFlag, BusinessConstant.BOOLEAN_INT_FALSE)
+ .eq(ApmRecord::getApmStatus, BusinessConstant.RECORD_STATUS_UNREGISTER)
+ .le(ApmRecord::getApmTime, DateUtil.now()));
+
+ List recordUpdateList = new ArrayList<>();
+ List blacklists = new ArrayList<>();
+
+
+ List> renegedCountList = recordService.getRenegedCountList();
+ for (Map item : renegedCountList) {
+ Long createDept = (Long) item.get("createDept");
+ String cupName = (String) item.get("cupName");
+ String cupCardNo = (String) item.get("cupCardNo");
+ String cupPhone = (String) item.get("cupPhone");
+ int renegedTimes = (Integer) item.get("renegedTimes");
+
+ // 若未达到
+ if (renegedTimes < configRenegedTimes) {
+ continue;
+ }
+
+ // 2. 若未记录的违约记录 >= renegedTimes, 添加黑名单,
+ Blacklist blacklist = new Blacklist();
+ blacklist.setCreateDept(createDept);
+ blacklist.setCupName(cupName);
+ blacklist.setCupCardNo(cupCardNo);
+ blacklist.setCupPhone(cupPhone);
+ blacklist.setApmTime(DateUtil.now());
+ blacklists.add(blacklist);
+
+ // 更新违约记录的 blacklistFlag = 1
+ for (ApmRecord record : renegedList) {
+ if (record.getCupCardNo().equals(cupCardNo)) {
+ record.setBlacklistFlag(BusinessConstant.BOOLEAN_INT_TRUE);
+ recordUpdateList.add(record);
+ }
+ }
+
+ blacklistService.saveBatch(blacklists);
+ recordService.updateBatchById(recordUpdateList);
+ }
+ }
+}
diff --git a/src/main/java/org/springblade/modules/business/timer/QuartzConfig.java b/src/main/java/org/springblade/modules/business/timer/QuartzConfig.java
new file mode 100644
index 0000000..4eb207c
--- /dev/null
+++ b/src/main/java/org/springblade/modules/business/timer/QuartzConfig.java
@@ -0,0 +1,44 @@
+package org.springblade.modules.business.timer;
+
+import org.quartz.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QuartzConfig {
+ /**
+ * 添加黑名单定时任务表达式, 每天23:00执行
+ */
+ private String CRON_BLACKLIST_JOB = "0 0 23 * * ?";
+
+ /**
+ * 创建定时任务
+ */
+ @Bean
+ public JobDetail blacklistTimerJobDetail() {
+ JobDetail jobDetail = JobBuilder.newJob(BlacklistTimerJob.class)
+ .withIdentity("blacklistTimerJobDetail", "blacklist_job")
+ .usingJobData("userName", "admin")
+ .storeDurably()
+ .build();
+ return jobDetail;
+ }
+
+ /**
+ * 创建触发器
+ */
+ @Bean
+ public Trigger blacklistTimerJobTrigger() {
+ //每隔5秒执行一次
+ CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(CRON_BLACKLIST_JOB);
+
+ //创建触发器
+ Trigger trigger = TriggerBuilder.newTrigger()
+ .forJob(blacklistTimerJobDetail())
+ .withIdentity("blacklistTimerJobTrigger", "BLACKLIST_JOB_TRIGGER")
+ .withSchedule(cronScheduleBuilder)
+ .build();
+
+ return trigger;
+ }
+}
diff --git a/src/main/java/org/springblade/modules/system/controller/DictBizController.java b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
index f64c48e..d7e198d 100644
--- a/src/main/java/org/springblade/modules/system/controller/DictBizController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
+import org.springblade.common.constant.BusinessConstant;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.launch.constant.AppConstant;
@@ -176,5 +177,20 @@ public class DictBizController extends BladeController {
return R.data(DictBizWrapper.build().listNodeVO(tree));
}
+ @GetMapping("/get-hc-project")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "获取体检项目", notes = "获取体检项目")
+ public R> getHcProject() {
+ List tree = dictService.getList(BusinessConstant.DICT_KEY_HC_HEALTH);
+ return R.data(DictBizWrapper.build().listNodeVO(tree));
+ }
+
+ @GetMapping("/get-apm-config-deadline")
+ @ApiOperationSupport(order = 11)
+ @ApiOperation(value = "获取医院放号截至时间", notes = "获取医院放号截至时间")
+ public R> getHcApmConfigDeadline() {
+ List tree = dictService.getList(BusinessConstant.DICT_KEY_APM_CONFIG_DEADLINE);
+ return R.data(DictBizWrapper.build().listNodeVO(tree));
+ }
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8861c11..04842df 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -23,7 +23,7 @@ blade:
address: redis://127.0.0.1:6379
#本地文件上传
file:
- remote-mode: true
+ remote-mode: false
upload-domain: http://localhost:8999
remote-path: /usr/share/nginx/html