From 3c7410ea57e389c60eceafbf6ad2fab73981be05 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Tue, 24 Jun 2025 16:36:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/base/constant/MessageConstant.java | 8 ++++++++ .../base/controller/UserController.java | 5 +++-- .../impl/CoscoAnnualreviewTaskServiceImpl.java | 17 +++++++++-------- ...nnualreviewTemplateIndicatorServiceImpl.java | 5 +++-- .../CoscoAnnualreviewTemplateServiceImpl.java | 5 +++-- .../dao/mapper/CoscoBlacklistMapper.xml | 3 ++- .../supplier/coscoBlack/vo/BecomeDueVo.java | 4 ++++ .../service/impl/ScheduledTasksServiceImpl.java | 16 +++++++++++++++- .../base/dao/mapper/CoscoSupplierBaseMapper.xml | 11 +++++------ 9 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java new file mode 100644 index 0000000..7b14ef7 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java @@ -0,0 +1,8 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; + +public class MessageConstant { + /** + * 黑名单到期提醒 + */ + public static final String BLACKLIST_EXPIRE = "blacklist_expires"; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java index c7c8d05..442ecd2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.controller; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,8 +17,8 @@ public class UserController { @GetMapping("/getUserList") - public List getUserList() { - return getUser(); + public BaseResponse getUserList() { + return BaseResponse.success(getUser()); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java index c1a8545..6fadaaf 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskService; @@ -104,9 +105,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS public int insertCoscoAnnualreviewTask(AddTaskVo taskVo) { taskVo.setCreateTime(new Date()); taskVo.setUpdateTime(new Date()); - taskVo.setUpdateBy("admin"); + taskVo.setUpdateBy(SupplierUserConstant.USER_NAME); taskVo.setId(PropertyUtils.getSnowflakeId()); - taskVo.setCreateBy("admin"); + taskVo.setCreateBy(SupplierUserConstant.USER_NAME); taskVo.setStatus(AnnualreviewTaskConstant.NOT_START); coscoAnnualreviewTaskMapper.insertCoscoAnnualreviewTask(taskVo); addList(taskVo); @@ -130,9 +131,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS taskSupplier.setId(PropertyUtils.getSnowflakeId()); taskSupplier.setAnnualreviewTaskId(taskVo.getId()); taskSupplier.setSupplierId(vo.getSuppliedId()); - taskSupplier.setCreateBy("admin"); + taskSupplier.setCreateBy(SupplierUserConstant.USER_NAME); taskSupplier.setCreateTime(new Date()); - taskSupplier.setUpdateBy("admin"); + taskSupplier.setUpdateBy(SupplierUserConstant.USER_NAME); taskSupplier.setUpdateTime(new Date()); taskSupplierList.add(taskSupplier); List userIds = vo.getUserIds(); @@ -143,9 +144,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS taskSupplierUser.setAnnualreviewTaskId(taskVo.getId()); taskSupplierUser.setSupplierId(vo.getSuppliedId()); taskSupplierUser.setUserId(userId); - taskSupplierUser.setCreateBy("admin"); + taskSupplierUser.setCreateBy(SupplierUserConstant.USER_NAME); taskSupplierUser.setCreateTime(new Date()); - taskSupplierUser.setUpdateBy("admin"); + taskSupplierUser.setUpdateBy(SupplierUserConstant.USER_NAME); taskSupplierUser.setReviewStatus(AnnualreviewTaskConstant.WAIT_APPROVE); taskSupplierUser.setUpdateTime(new Date()); taskSupplierUserList.add(taskSupplierUser); @@ -154,9 +155,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS scoring.setId(PropertyUtils.getSnowflakeId()); scoring.setAnnualreviewTaskSupplierUserId(taskSupplierUser.getId()); scoring.setTemplateItemId(ind.getId()); - scoring.setCreateBy("admin"); + scoring.setCreateBy(SupplierUserConstant.USER_NAME); scoring.setCreateTime(new Date()); - scoring.setUpdateBy("admin"); + scoring.setUpdateBy(SupplierUserConstant.USER_NAME); scoring.setUpdateTime(new Date()); scoringList.add(scoring); }); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java index 66f5799..0a0c23d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddCoscoAnnualreviewTemplateVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -105,10 +106,10 @@ public class CoscoAnnualreviewTemplateIndicatorServiceImpl implements ICoscoAnnu for (CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator : indicatorList) { coscoAnnualreviewTemplateIndicator.setCreateTime(new Date()); coscoAnnualreviewTemplateIndicator.setUpdateTime(new Date()); - coscoAnnualreviewTemplateIndicator.setUpdateBy("admin"); + coscoAnnualreviewTemplateIndicator.setUpdateBy(SupplierUserConstant.USER_NAME); coscoAnnualreviewTemplateIndicator.setTemplateId(coscoAnnualreviewTemplate.getId()); coscoAnnualreviewTemplateIndicator.setId(PropertyUtils.getSnowflakeId()); - coscoAnnualreviewTemplateIndicator.setCreateBy("admin"); + coscoAnnualreviewTemplateIndicator.setCreateBy(SupplierUserConstant.USER_NAME); } coscoAnnualreviewTemplateIndicatorMapper.batchCoscoAnnualreviewTemplateIndicator(indicatorList); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java index f9f2d10..88537e6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ReviewTemplateConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTemplateMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplate; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplateIndicator; @@ -70,9 +71,9 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT public int insertCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { coscoAnnualreviewTemplate.setCreateTime(new Date()); coscoAnnualreviewTemplate.setUpdateTime(new Date()); - coscoAnnualreviewTemplate.setUpdateBy("admin"); + coscoAnnualreviewTemplate.setUpdateBy(SupplierUserConstant.USER_NAME); coscoAnnualreviewTemplate.setId(PropertyUtils.getSnowflakeId()); - coscoAnnualreviewTemplate.setCreateBy("admin"); + coscoAnnualreviewTemplate.setCreateBy(SupplierUserConstant.USER_NAME); coscoAnnualreviewTemplateMapper.insertCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate); coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate); return 1; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml index 01018ca..8b473e9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml @@ -232,7 +232,8 @@