diff --git a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/constant/ServiceConstant.java b/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/constant/ServiceConstant.java index fe7a28f..f07976b 100644 --- a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/constant/ServiceConstant.java +++ b/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/constant/ServiceConstant.java @@ -23,7 +23,12 @@ public interface ServiceConstant { * 工单 相关 * 项目-工单 */ - String WRK = "inspection-service"; + String INSPECTION = "inspection-service"; + + /** + * 工单模块消费者组 + */ + String INSPECTION_CONSUMER_GROUP = "inspection_consumer_group"; /** * 文件模块消费者组 */ diff --git a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/base/BaseEntity.java b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/base/BaseEntity.java index a92ef6e..056a409 100644 --- a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/base/BaseEntity.java +++ b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/base/BaseEntity.java @@ -57,7 +57,7 @@ public class BaseEntity implements Serializable { @TableField( value = "version", update = "%s+1", - fill = FieldFill.INSERT + fill = FieldFill.INSERT_UPDATE ) protected Long version; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java index 7fc1e88..37dc5d8 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java @@ -26,7 +26,7 @@ import java.util.Objects; */ @Slf4j @Component -@RocketMQMessageListener(topic = ServiceConstant.SYSTEM, consumerGroup = ServiceConstant.SYSTEM_CONSUMER_GROUP) +@RocketMQMessageListener(topic = ServiceConstant.INSPECTION, consumerGroup = ServiceConstant.INSPECTION_CONSUMER_GROUP) public class InspectionConsumerService implements RocketMQListener { @Resource RemoteTaskService remoteTaskService; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java index df1be6d..e4976a4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -52,8 +52,9 @@ public class WrkProjectController { BeanUtil.copyProperties(project, wrkProject); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); wrkProject.setDeptId(deptId); + // 应该显示 未提交审核 + wrkProject.setAuditStatus(0); projectService.save(wrkProject); - return AjaxResult.success(wrkProject.getProjectId()); } diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDictDTO.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDictDTO.java index 4064d0a..a86139e 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDictDTO.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDictDTO.java @@ -38,4 +38,8 @@ public class ListDictDTO { * 状态（1正常 0停用） */ private Boolean status; + /** + * 根据label 查询 + */ + private String dictLabel; } diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java index 50aac51..8d41db2 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysConfig.java @@ -5,6 +5,7 @@ import javax.validation.constraints.Size; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; +import com.chushang.common.mybatis.annotation.Condition; import com.chushang.common.mybatis.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,14 +33,17 @@ public class SysConfig extends BaseEntity /** 参数主键 */ @TableId(value = "config_id", type = IdType.ASSIGN_ID) @ExcelProperty(value = "参数主键", index = 0) + @Condition(name = "config_id", type = Condition.ConditionType.eq) private Long configId; /** 参数名称 */ @ExcelProperty(value = "参数名称", index = 1) + @Condition(name = "config_name", type = Condition.ConditionType.like) private String configName; /** 参数键名 */ @ExcelProperty(value = "参数键名", index = 2) + @Condition(name = "config_key", type = Condition.ConditionType.eq) private String configKey; /** 参数键值 */ diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysDictType.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysDictType.java index 325fea8..72b7604 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysDictType.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysDictType.java @@ -4,9 +4,12 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; +import cn.hutool.core.date.DatePattern; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; +import com.chushang.common.mybatis.annotation.Condition; import com.chushang.common.mybatis.base.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -16,6 +19,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import java.io.Serial; +import java.time.LocalDateTime; +import java.util.List; /** * 字典类型表 sys_dict_type @@ -39,14 +44,17 @@ public class SysDictType extends BaseEntity /** 字典名称 */ @ExcelProperty(value = "字典名称", index = 1) + @Condition(name = "dict_name", type = Condition.ConditionType.like) private String dictName; /** 字典类型 */ @ExcelProperty(value = "字典类型", index = 2) + @Condition(name = "dict_type", type = Condition.ConditionType.eq) private String dictType; /** 状态（1正常 0停用） */ @ExcelProperty(value = "状态", index = 3) + @Condition(name = "status", type = Condition.ConditionType.eq) private Boolean status; /** * 创建人 @@ -64,4 +72,12 @@ public class SysDictType extends BaseEntity ) @ExcelProperty(value = "修改人", index = 5) protected String updateBy; + /** + * 查询区间 + */ + @Condition(name = "create_time", type = Condition.ConditionType.between) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN) + @TableField(exist = false) + private List createTimes; + } diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysLoginInfo.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysLoginInfo.java index 5d5581a..b1d4b34 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysLoginInfo.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysLoginInfo.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.chushang.common.mybatis.annotation.Condition; import com.chushang.common.mybatis.base.BaseEntity; import com.chushang.system.entity.enums.LoginStatusEnum; import lombok.*; @@ -25,15 +26,19 @@ import java.time.LocalDateTime; public class SysLoginInfo extends BaseEntity { @TableId(value = "info_id", type = IdType.ASSIGN_ID) + @Condition(name = "info_id", type = Condition.ConditionType.eq) private Long infoId; @TableField(value = "username") + @Condition(name = "username", type = Condition.ConditionType.like) private String username; @TableField(value = "status") + @Condition(name = "status", type = Condition.ConditionType.eq) private LoginStatusEnum status; @TableField(value = "ipaddr") + @Condition(name = "ipaddr", type = Condition.ConditionType.like) private String ipaddr; @TableField(value = "msg") diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysConfigService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysConfigService.java index e4c6a5f..1a5367e 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysConfigService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysConfigService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.system.entity.po.SysConfig; import java.util.List; @@ -19,7 +20,9 @@ public interface ISysConfigService extends IService { buildWrapper(config, commonParam) )); } - LambdaQueryWrapper buildWrapper(SysConfig sysConfig, CommonParam commonParam); + default LambdaQueryWrapper buildWrapper(SysConfig sysConfig, CommonParam commonParam){ + return WrapperUtils.builder(sysConfig, sysConfig, commonParam); + } default List allConfigList(SysConfig config, CommonParam commonParam){ return this.list(this.buildWrapper(config, commonParam)); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java index b833841..9557fc4 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java @@ -1,9 +1,11 @@ package com.chushang.system.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.system.entity.po.SysDictType; import java.util.List; @@ -13,12 +15,20 @@ import java.util.List; * @date: 2024/5/9 15:53 */ public interface ISysDictTypeService extends IService { - PageResult pageDictTypeList(SysDictType dictType, CommonParam commonParam); + default PageResult pageDictTypeList(SysDictType dictType, CommonParam commonParam){ + IPage page = this.page( + new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), + WrapperUtils.builder(dictType, dictType, commonParam) + ); + return new PageResult(page); + } default List allDictTypeList(SysDictType dictType, CommonParam commonParam){ return this.list(buildWrapper(dictType, commonParam)); } - LambdaQueryWrapper buildWrapper(SysDictType dictType, CommonParam commonParam); + default LambdaQueryWrapper buildWrapper(SysDictType dictType, CommonParam commonParam){ + return WrapperUtils.builder(dictType, dictType, commonParam); + } default boolean checkDictTypeUnique(SysDictType dictType, CommonParam commonParam){ return this.count(buildWrapper(dictType, commonParam)) > 0; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java index a754952..72417d5 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/SysLoginInfoService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.system.entity.dto.ListLoginLogDTO; import com.chushang.system.entity.po.SysDictType; import com.chushang.system.entity.po.SysLoginInfo; @@ -17,7 +18,9 @@ public interface SysLoginInfoService extends IService { return save(sysLogininfo) ? AjaxResult.success() : AjaxResult.error(); } - LambdaQueryWrapper buildWrapper(SysLoginInfo loginInfo, CommonParam commonParam); + default LambdaQueryWrapper buildWrapper(SysLoginInfo loginInfo, CommonParam commonParam){ + return WrapperUtils.builder(loginInfo, loginInfo, commonParam); + } default PageResult pagePostList(SysLoginInfo loginInfo, CommonParam commonParam) { IPage page = this.page( diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysConfigServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysConfigServiceImpl.java index 7b5b42f..0f690a1 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysConfigServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysConfigServiceImpl.java @@ -19,13 +19,4 @@ import org.springframework.stereotype.Service; @Slf4j @Service public class SysConfigServiceImpl extends ServiceImpl implements ISysConfigService { - public LambdaQueryWrapper buildWrapper(SysConfig sysConfig, CommonParam commonParam) { - return new QueryWrapper() - .orderBy(true, "asc".equals(commonParam.getIsAsc()), commonParam.getOrderBy()) - .lambda() - .eq(null != sysConfig.getConfigId(), SysConfig::getConfigId, sysConfig.getConfigId()) - .eq(StringUtils.isNotEmpty(sysConfig.getConfigName()), SysConfig::getConfigName, sysConfig.getConfigName()) - .eq(StringUtils.isNotEmpty(sysConfig.getConfigKey()), SysConfig::getConfigKey, sysConfig.getConfigKey()) - .eq(StringUtils.isNotEmpty(sysConfig.getConfigType()), SysConfig::getConfigType, sysConfig.getConfigType()); - } } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDictDataServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDictDataServiceImpl.java index 6c5645d..79874cf 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDictDataServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDictDataServiceImpl.java @@ -76,6 +76,7 @@ public class SysDictDataServiceImpl extends ServiceImpl implements ISysDictTypeService { - @Override - public PageResult pageDictTypeList(SysDictType dictType, CommonParam commonParam) { - IPage page = this.page( - new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), - buildWrapper(dictType, commonParam) - ); - return new PageResult(page); - } - - public LambdaQueryWrapper buildWrapper(SysDictType dictType, CommonParam commonParam) { - return new QueryWrapper() - .orderBy(true, "asc".equals(commonParam.getIsAsc()), commonParam.getOrderBy()) - .lambda() - .eq(null != dictType.getDictId(), SysDictType::getDictId, dictType.getDictId()) - .eq(StringUtils.isNotEmpty(dictType.getDictType()), SysDictType::getDictType, dictType.getDictType()) - .eq(StringUtils.isNotEmpty(dictType.getDictName()), SysDictType::getDictName, dictType.getDictName()) - .eq(null != dictType.getStatus(), SysDictType::getStatus, dictType.getStatus()); - } } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java index 6e0de0e..4d905e1 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysLoginInfoServiceImpl.java @@ -16,15 +16,4 @@ import org.springframework.stereotype.Service; @Slf4j @Service public class SysLoginInfoServiceImpl extends ServiceImpl implements SysLoginInfoService { - - @Override - public LambdaQueryWrapper buildWrapper(SysLoginInfo loginInfo, CommonParam commonParam) { - return new QueryWrapper() - .orderBy(true, "asc".equals(commonParam.getIsAsc()), commonParam.getOrderBy()) - .lambda() - .eq(null != loginInfo.getInfoId(), SysLoginInfo::getInfoId, loginInfo.getInfoId()) - .eq(StringUtils.isNotEmpty(loginInfo.getUsername()), SysLoginInfo::getUsername, loginInfo.getUsername()) - .eq(StringUtils.isNotEmpty(loginInfo.getIpaddr()), SysLoginInfo::getIpaddr, loginInfo.getIpaddr()) - .eq(null != loginInfo.getStatus(), SysLoginInfo::getStatus, loginInfo.getStatus()); - } } diff --git a/chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/enums/ServiceEnum.java b/chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/enums/ServiceEnum.java index c03bfd9..69d759c 100644 --- a/chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/enums/ServiceEnum.java +++ b/chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/enums/ServiceEnum.java @@ -1,6 +1,5 @@ package com.chushang.task.enums; -import com.baomidou.mybatisplus.annotation.IEnum; import com.chushang.common.core.constant.ServiceConstant; import lombok.AllArgsConstructor; import lombok.Getter; @@ -27,7 +26,7 @@ public enum ServiceEnum { /** * 工单 */ - WRK(ServiceConstant.WRK), + INSPECTION(ServiceConstant.INSPECTION), /** * 后台任务 */