fix:去除museum模块，功能合并至digital

pom.xml

@@ -358,12 +358,6 @@
                 <version>${revision}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.inspur</groupId>
-                <artifactId>smsb-museum</artifactId>
-                <version>${revision}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 

smsb-admin/pom.xml

@@ -117,11 +117,6 @@
             <artifactId>smsb-digital-promotion</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.inspur</groupId>
-            <artifactId>smsb-museum</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>

smsb-modules/pom.xml

@@ -19,7 +19,6 @@
         <module>smsb-netty</module>
         <module>smsb-source</module>
         <module>smsb-digital-promotion</module>
-        <module>smsb-museum</module>
     </modules>
 
     <artifactId>smsb-modules</artifactId>

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/controller/FileUploadController.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/controller/FileUploadController.java

@@ -1,9 +1,9 @@
-package com.inspur.museum.controller;
+package com.inspur.digital.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.inspur.device.domain.constants.ResultCodeEnum;
-import com.inspur.museum.domain.bo.SmsbMuseumImageBo;
-import com.inspur.museum.service.ISmsbMuseumImageService;
+import com.inspur.digital.domain.bo.SmsbMuseumImageBo;
+import com.inspur.digital.service.ISmsbMuseumImageService;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
@@ -11,7 +11,6 @@ import org.dromara.common.oss.core.OssClient;
 import org.dromara.common.oss.entity.UploadResult;
 import org.dromara.common.oss.factory.OssFactory;
 import org.dromara.system.domain.vo.SysOssUploadVo;
-import org.dromara.system.service.ISysOssService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/controller/SmsbMuseumImageController.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/controller/SmsbMuseumImageController.java

@@ -1,26 +1,27 @@
-package com.inspur.museum.controller;
+package com.inspur.digital.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
+import com.inspur.digital.domain.bo.SmsbMuseumImageBo;
+import com.inspur.digital.domain.vo.SmsbMuseumImageVo;
+import com.inspur.digital.service.ISmsbMuseumImageService;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import com.inspur.museum.domain.vo.SmsbMuseumImageVo;
-import com.inspur.museum.domain.bo.SmsbMuseumImageBo;
-import com.inspur.museum.service.ISmsbMuseumImageService;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 国博图片上传

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/domain/SmsbMuseumImage.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/domain/SmsbMuseumImage.java

@@ -1,4 +1,4 @@
-package com.inspur.museum.domain;
+package com.inspur.digital.domain;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/domain/bo/SmsbMuseumImageBo.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/domain/bo/SmsbMuseumImageBo.java

@@ -1,13 +1,14 @@
-package com.inspur.museum.domain.bo;
+package com.inspur.digital.domain.bo;
 
-import com.inspur.museum.domain.SmsbMuseumImage;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
+import com.inspur.digital.domain.SmsbMuseumImage;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 国博图片上传业务对象 smsb_museum_image

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/domain/vo/SmsbMuseumImageVo.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/domain/vo/SmsbMuseumImageVo.java

@@ -1,17 +1,13 @@
-package com.inspur.museum.domain.vo;
+package com.inspur.digital.domain.vo;
 
-import com.inspur.museum.domain.SmsbMuseumImage;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
+import com.inspur.digital.domain.SmsbMuseumImage;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/mapper/SmsbMuseumImageMapper.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/mapper/SmsbMuseumImageMapper.java

@@ -1,14 +1,10 @@
-package com.inspur.museum.mapper;
+package com.inspur.digital.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.inspur.device.domain.SmsbDevice;
-import com.inspur.device.domain.vo.SmsbDeviceVo;
-import com.inspur.museum.domain.SmsbMuseumImage;
-import com.inspur.museum.domain.vo.SmsbMuseumImageVo;
+import com.inspur.digital.domain.SmsbMuseumImage;
+import com.inspur.digital.domain.vo.SmsbMuseumImageVo;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/service/ISmsbMuseumImageService.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/service/ISmsbMuseumImageService.java

@@ -1,9 +1,9 @@
-package com.inspur.museum.service;
+package com.inspur.digital.service;
 
-import com.inspur.museum.domain.vo.SmsbMuseumImageVo;
-import com.inspur.museum.domain.bo.SmsbMuseumImageBo;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
+import com.inspur.digital.domain.bo.SmsbMuseumImageBo;
+import com.inspur.digital.domain.vo.SmsbMuseumImageVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 import java.util.Collection;
 import java.util.List;

smsb-modules/smsb-museum/src/main/java/com/inspur/museum/service/impl/SmsbMuseumImageServiceImpl.java → smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/service/impl/SmsbMuseumImageServiceImpl.java

@@ -1,26 +1,25 @@
-package com.inspur.museum.service.impl;
+package com.inspur.digital.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.inspur.digital.domain.SmsbMuseumImage;
+import com.inspur.digital.domain.bo.SmsbMuseumImageBo;
+import com.inspur.digital.domain.vo.SmsbMuseumImageVo;
+import com.inspur.digital.mapper.SmsbMuseumImageMapper;
+import com.inspur.digital.service.ISmsbMuseumImageService;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.stereotype.Service;
-import com.inspur.museum.domain.bo.SmsbMuseumImageBo;
-import com.inspur.museum.domain.vo.SmsbMuseumImageVo;
-import com.inspur.museum.domain.SmsbMuseumImage;
-import com.inspur.museum.mapper.SmsbMuseumImageMapper;
-import com.inspur.museum.service.ISmsbMuseumImageService;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 国博图片上传Service业务层处理

smsb-modules/smsb-museum/src/main/resources/mapper/museum/SmsbMuseumImageMapper.xml → smsb-modules/smsb-digital-promotion/src/main/resources/mapper/digital/SmsbMuseumImageMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.inspur.museum.mapper.SmsbMuseumImageMapper">
+<mapper namespace="com.inspur.digital.mapper.SmsbMuseumImageMapper">
 
-    <select id="selectAdminVoPage" resultType="com.inspur.museum.domain.vo.SmsbMuseumImageVo">
+    <select id="selectAdminVoPage" resultType="com.inspur.digital.domain.vo.SmsbMuseumImageVo">
         SELECT *
         FROM smsb_museum_image ${ew.customSqlSegment}
     </select>

smsb-modules/smsb-museum/pom.xml

@@ -1,53 +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.inspur</groupId>
-        <artifactId>smsb-modules</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>smsb-museum</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>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.inspur</groupId>
-            <artifactId>smsb-common-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.inspur</groupId>
-            <artifactId>smsb-common-oss</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.inspur</groupId>
-            <artifactId>smsb-device</artifactId>
-            <version>5.2.3</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-</project>