Merge remote-tracking branch 'origin/dev' into dev

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java

@@ -1,5 +1,7 @@
 package com.muyu.common.cache;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * 主键基础
  * * @className: PrimaryKeyBasic  ️✈️

cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules-enterprise</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>enterpise-cache</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-cache</artifactId>
-            <version>${muyu.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>enterpise-common</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +0,0 @@
-com.muyu.enterpise.cache.MessageValueCacheService
-com.muyu.enterpise.cache.SysCarCacheService

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java

@@ -84,7 +84,6 @@ public class SysCar extends BaseEntity{
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
             .toString();
     }
 }

cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml

@@ -21,6 +21,7 @@
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-common</artifactId>
+            <version>${muyu.version}</version>
         </dependency>
     </dependencies>
 </project>

cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml

@@ -22,6 +22,7 @@
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-common</artifactId>
+            <version>${muyu.version}</version>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos -->
@@ -87,7 +88,7 @@
         <!--    cache缓存框架    -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>enterpise-cache</artifactId>
+            <artifactId>enterprise-cache</artifactId>
             <version>${muyu.version}</version>
         </dependency>
 

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java

@@ -4,7 +4,6 @@ import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.domain.SysCarType;
-import com.muyu.enterpise.cache.SysCarCacheService;
 import com.muyu.enterpise.cache.SysCarTypeCacheService;
 import com.muyu.enterpise.service.SysTypeService;
 import io.swagger.v3.oas.annotations.tags.Tag;

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java

@@ -15,5 +15,5 @@ import java.util.List;
 @Mapper
 public interface SysCarMapper extends BaseMapper<SysCar>{
 
-    List<SysCarResp> selectSysCarList(SysCar sysCar);
+//    List<SysCarResp> selectSysCarList(SysCar sysCar);
 }

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java

@@ -19,6 +19,6 @@ import java.util.List;
  */
 public interface SysTypeMapper extends BaseMapper<SysCarType> {
 
-    List<SysCarType> selectSysList();
+//    List<SysCarType> selectSysList();
 
 }

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java

@@ -10,7 +10,6 @@ import com.muyu.domain.resp.MessageValueListResp;
 import com.muyu.enterpise.cache.MessageValueCacheService;
 import com.muyu.enterpise.mapper.MessageValueMapper;
 import com.muyu.enterpise.service.MessageValueService;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java

@@ -39,8 +39,6 @@ public class SysCarServiceImpl
         LambdaQueryWrapper<SysCar> queryWrapper = new LambdaQueryWrapper<>();
         Assert.notNull(id, "id不可为空");
         queryWrapper.eq(SysCar::getId, id);
-
-
         return this.getOne(queryWrapper);
     }
 

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java

@@ -30,7 +30,7 @@ public class SysTypeServiceImpl
      */
     @Override
     public List<SysCarType> selectSysTypeList() {
-        return sysTypeMapper.selectSysList();
+        return this.list();
     }
 
 

cloud-modules/cloud-modules-parse/pom.xml

@@ -99,11 +99,12 @@
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-common</artifactId>
+            <version>${muyu.version}</version>
         </dependency>
             <!--      缓存框架          -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>enterpise-cache</artifactId>
+            <artifactId>enterprise-cache</artifactId>
             <version>${muyu.version}</version>
         </dependency>
 

pom.xml

@@ -277,11 +277,11 @@
                 <version>${muyu.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.muyu</groupId>
-                <artifactId>enterpise-common</artifactId>
-                <version>${muyu.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.muyu</groupId>-->
+<!--                <artifactId>enterpise-common</artifactId>-->
+<!--                <version>${muyu.version}</version>-->
+<!--            </dependency>-->
 
 <!--            <dependency>-->
 <!--                <groupId>com.muyu</groupId>-->