Merge remote-tracking branch 'origin/master'

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";
     /**
      * 文件模块消费者组
      */

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;
 

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<TaskInfo> {
     @Resource
     RemoteTaskService remoteTaskService;

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());
     }
 

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;
 }

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;
 
     /** 参数键值 */

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<LocalDateTime> createTimes;
+
 }

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")

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<SysConfig> {
                 buildWrapper(config, commonParam)
         ));
     }
-    LambdaQueryWrapper<SysConfig> buildWrapper(SysConfig sysConfig, CommonParam commonParam);
+    default LambdaQueryWrapper<SysConfig> buildWrapper(SysConfig sysConfig, CommonParam commonParam){
+        return WrapperUtils.builder(sysConfig, sysConfig, commonParam);
+    }
 
     default List<SysConfig> allConfigList(SysConfig config, CommonParam commonParam){
         return this.list(this.buildWrapper(config, commonParam));

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<SysDictType> {
-    PageResult pageDictTypeList(SysDictType dictType, CommonParam commonParam);
+    default PageResult pageDictTypeList(SysDictType dictType, CommonParam commonParam){
+        IPage<SysDictType> 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<SysDictType> allDictTypeList(SysDictType dictType, CommonParam commonParam){
         return this.list(buildWrapper(dictType, commonParam));
     }
 
-    LambdaQueryWrapper<SysDictType> buildWrapper(SysDictType dictType, CommonParam commonParam);
+    default LambdaQueryWrapper<SysDictType> 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;

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<SysLoginInfo> {
         return save(sysLogininfo) ? AjaxResult.success() : AjaxResult.error();
     }
 
-    LambdaQueryWrapper<SysLoginInfo> buildWrapper(SysLoginInfo loginInfo, CommonParam commonParam);
+    default LambdaQueryWrapper<SysLoginInfo> buildWrapper(SysLoginInfo loginInfo, CommonParam commonParam){
+        return WrapperUtils.builder(loginInfo, loginInfo, commonParam);
+    }
 
     default PageResult pagePostList(SysLoginInfo loginInfo, CommonParam commonParam) {
         IPage<SysLoginInfo> page = this.page(

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<SysConfigMapper, SysConfig> implements ISysConfigService {
-    public LambdaQueryWrapper<SysConfig> buildWrapper(SysConfig sysConfig, CommonParam commonParam) {
-        return new QueryWrapper<SysConfig>()
-                .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());
-    }
 }

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<SysDictDataMapper, SysDi
                 .orderBy(true, "asc".equals(commonParam.getIsAsc()), commonParam.getOrderBy())
                 .lambda()
                 .eq(null != dictData.getDictCode(), SysDictData::getDictCode, dictData.getDictCode())
+                .like(StringUtils.isNotEmpty(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
                 .eq(StringUtils.isNotEmpty(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
                 .eq(StringUtils.isNotEmpty(dictData.getCssClass()), SysDictData::getCssClass, dictData.getCssClass())
                 .eq(StringUtils.isNotEmpty(dictData.getListClass()), SysDictData::getListClass, dictData.getListClass())

chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDictTypeServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.ListDictDTO;
 import com.chushang.system.entity.po.SysDictData;
 import com.chushang.system.entity.po.SysDictType;
@@ -24,22 +25,4 @@ import java.util.List;
 @Slf4j
 @Service
 public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
-    @Override
-    public PageResult pageDictTypeList(SysDictType dictType, CommonParam commonParam) {
-        IPage<SysDictType> page = this.page(
-                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),
-                buildWrapper(dictType, commonParam)
-        );
-        return new PageResult(page);
-    }
-
-    public LambdaQueryWrapper<SysDictType> buildWrapper(SysDictType dictType, CommonParam commonParam) {
-        return new QueryWrapper<SysDictType>()
-                .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());
-    }
 }

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<SysLoginInfoMapper, SysLoginInfo> implements SysLoginInfoService {
-
-    @Override
-    public LambdaQueryWrapper<SysLoginInfo> buildWrapper(SysLoginInfo loginInfo, CommonParam commonParam) {
-        return new QueryWrapper<SysLoginInfo>()
-                .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());
-    }
 }

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),
     /**
      * 后台任务
      */