diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 7e556cb..a9ab124 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -20,8 +20,11 @@ import com.casic.missiles.modular.interfaces.log.LogManager; import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SpringContextUtil; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.subject.Subject; import org.springframework.stereotype.Controller; @@ -29,10 +32,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.security.NoSuchAlgorithmException; import java.util.Map; import static com.casic.missiles.core.util.HttpContext.getIp; +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; /** @@ -117,4 +122,12 @@ log.info(printFileName); } + @Resource + private MeterCertificateService meterCertificateService; + @GetMapping("/job") + public ReturnT execute() throws Exception { + meterCertificateService.regularExpirationReminder(); + return SUCCESS; + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 7e556cb..a9ab124 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -20,8 +20,11 @@ import com.casic.missiles.modular.interfaces.log.LogManager; import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SpringContextUtil; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.subject.Subject; import org.springframework.stereotype.Controller; @@ -29,10 +32,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.security.NoSuchAlgorithmException; import java.util.Map; import static com.casic.missiles.core.util.HttpContext.getIp; +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; /** @@ -117,4 +122,12 @@ log.info(printFileName); } + @Resource + private MeterCertificateService meterCertificateService; + @GetMapping("/job") + public ReturnT execute() throws Exception { + meterCertificateService.regularExpirationReminder(); + return SUCCESS; + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aa47cff..080b72b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -84,7 +84,8 @@ UNABLE_TO_URGE(2431, "该部门不存在负责人,无法催办"), USER_ID_EMPTY(2432, "用户id不能为空"), CLIENT_ID_EMPTY(2433, "用户id不能为空"), - URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"); + URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"), + DEVICE_USER_OR_EMPTY(2434, "设备备删除或者催办人不存在,无法催办"); private Integer code; private String message; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 7e556cb..a9ab124 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -20,8 +20,11 @@ import com.casic.missiles.modular.interfaces.log.LogManager; import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SpringContextUtil; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.subject.Subject; import org.springframework.stereotype.Controller; @@ -29,10 +32,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.security.NoSuchAlgorithmException; import java.util.Map; import static com.casic.missiles.core.util.HttpContext.getIp; +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; /** @@ -117,4 +122,12 @@ log.info(printFileName); } + @Resource + private MeterCertificateService meterCertificateService; + @GetMapping("/job") + public ReturnT execute() throws Exception { + meterCertificateService.regularExpirationReminder(); + return SUCCESS; + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aa47cff..080b72b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -84,7 +84,8 @@ UNABLE_TO_URGE(2431, "该部门不存在负责人,无法催办"), USER_ID_EMPTY(2432, "用户id不能为空"), CLIENT_ID_EMPTY(2433, "用户id不能为空"), - URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"); + URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"), + DEVICE_USER_OR_EMPTY(2434, "设备备删除或者催办人不存在,无法催办"); private Integer code; private String message; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index d56197e..9e6feaf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -305,6 +305,8 @@ Boolean sendFlag = messagePushService.pushToUser(remindMessage); return ReturnUtil.success(); } + }else { + throw new BusinessException(BusinessExceptionEnum.URGER_IS_EMPTY); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 7e556cb..a9ab124 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -20,8 +20,11 @@ import com.casic.missiles.modular.interfaces.log.LogManager; import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SpringContextUtil; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.subject.Subject; import org.springframework.stereotype.Controller; @@ -29,10 +32,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.security.NoSuchAlgorithmException; import java.util.Map; import static com.casic.missiles.core.util.HttpContext.getIp; +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; /** @@ -117,4 +122,12 @@ log.info(printFileName); } + @Resource + private MeterCertificateService meterCertificateService; + @GetMapping("/job") + public ReturnT execute() throws Exception { + meterCertificateService.regularExpirationReminder(); + return SUCCESS; + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aa47cff..080b72b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -84,7 +84,8 @@ UNABLE_TO_URGE(2431, "该部门不存在负责人,无法催办"), USER_ID_EMPTY(2432, "用户id不能为空"), CLIENT_ID_EMPTY(2433, "用户id不能为空"), - URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"); + URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"), + DEVICE_USER_OR_EMPTY(2434, "设备备删除或者催办人不存在,无法催办"); private Integer code; private String message; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index d56197e..9e6feaf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -305,6 +305,8 @@ Boolean sendFlag = messagePushService.pushToUser(remindMessage); return ReturnUtil.success(); } + }else { + throw new BusinessException(BusinessExceptionEnum.URGER_IS_EMPTY); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index b29adfc..397fd62 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; @@ -91,7 +92,7 @@ private IDeptService deptService; @Autowired - private IMessagePushService messagePushService; + private IMessagePushService messagePushService; /** * 分页查询 @@ -446,12 +447,16 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId()); - if (fixedAssets != null) { - WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName()); + if (fixedAssets != null && ObjectUtils.isNotEmpty(fixedAssets.getUsePerson())) { + WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), + MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), + MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName()); if (messageMapper.insert(remindMessage) > 0) { Boolean sendFlag = messagePushService.pushToUser(remindMessage); return ReturnUtil.success(); } + } else { + throw new BusinessException(BusinessExceptionEnum.DEVICE_USER_OR_EMPTY); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 7e556cb..a9ab124 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -20,8 +20,11 @@ import com.casic.missiles.modular.interfaces.log.LogManager; import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SpringContextUtil; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.subject.Subject; import org.springframework.stereotype.Controller; @@ -29,10 +32,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.security.NoSuchAlgorithmException; import java.util.Map; import static com.casic.missiles.core.util.HttpContext.getIp; +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; /** @@ -117,4 +122,12 @@ log.info(printFileName); } + @Resource + private MeterCertificateService meterCertificateService; + @GetMapping("/job") + public ReturnT execute() throws Exception { + meterCertificateService.regularExpirationReminder(); + return SUCCESS; + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aa47cff..080b72b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -84,7 +84,8 @@ UNABLE_TO_URGE(2431, "该部门不存在负责人,无法催办"), USER_ID_EMPTY(2432, "用户id不能为空"), CLIENT_ID_EMPTY(2433, "用户id不能为空"), - URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"); + URGER_IS_EMPTY(2434, "催办人不存在或被删除,无法催办"), + DEVICE_USER_OR_EMPTY(2434, "设备备删除或者催办人不存在,无法催办"); private Integer code; private String message; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index d56197e..9e6feaf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -305,6 +305,8 @@ Boolean sendFlag = messagePushService.pushToUser(remindMessage); return ReturnUtil.success(); } + }else { + throw new BusinessException(BusinessExceptionEnum.URGER_IS_EMPTY); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index b29adfc..397fd62 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; @@ -91,7 +92,7 @@ private IDeptService deptService; @Autowired - private IMessagePushService messagePushService; + private IMessagePushService messagePushService; /** * 分页查询 @@ -446,12 +447,16 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId()); - if (fixedAssets != null) { - WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName()); + if (fixedAssets != null && ObjectUtils.isNotEmpty(fixedAssets.getUsePerson())) { + WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), + MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), + MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName()); if (messageMapper.insert(remindMessage) > 0) { Boolean sendFlag = messagePushService.pushToUser(remindMessage); return ReturnUtil.success(); } + } else { + throw new BusinessException(BusinessExceptionEnum.DEVICE_USER_OR_EMPTY); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java index 552fd0a..5c100d6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java @@ -24,6 +24,5 @@ List deviceScanStatus(DeviceScanDTO deviceScanDTO) throws Exception; - ReturnDTO remindWorker(DeviceStatusChangeDTO deviceStatusChangeDTO); }