基础配置

snowy-web-app/src/main/java/vip/xiaonuo/core/config/BaseConfigure.java

@@ -46,22 +46,142 @@ public class BaseConfigure {
      * @date 2022/7/7 16:18
      **/
     @Bean(value = "baseDocApi")
-    public Docket bizDocApi() {
+    public Docket baseDocApi() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(new ApiInfoBuilder()
-                        .title("基本功能")
-                        .description("基本功能")
+                        .title("基础管理")
+                        .description("基础管理")
                         .termsOfServiceUrl("https://www.xiaonuo.vip")
-                        .contact(new Contact("SNOWY_TEAM","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
+                        .contact(new Contact("HUIMV","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
                         .version("2.0.0")
                         .build())
                 .globalResponseMessage(RequestMethod.GET, CommonResult.responseList())
                 .globalResponseMessage(RequestMethod.POST, CommonResult.responseList())
-                .groupName("基本功能")
+                .groupName("基础管理")
                 .select()
                 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular"))
+                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular.base"))
                 .paths(PathSelectors.any())
-                .build().extensions(openApiExtensionResolver.buildExtensions("基本功能"));
+                .build().extensions(openApiExtensionResolver.buildExtensions("基础管理"));
+    }
+
+    @Bean(value = "aiDocApi")
+    public Docket aiDocApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(new ApiInfoBuilder()
+                        .title("AI巡检预警系统")
+                        .description("AI巡检预警系统")
+                        .termsOfServiceUrl("https://www.xiaonuo.vip")
+                        .contact(new Contact("HUIMV","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
+                        .version("2.0.0")
+                        .build())
+                .globalResponseMessage(RequestMethod.GET, CommonResult.responseList())
+                .globalResponseMessage(RequestMethod.POST, CommonResult.responseList())
+                .groupName("AI巡检预警系统")
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular.ai"))
+                .paths(PathSelectors.any())
+                .build().extensions(openApiExtensionResolver.buildExtensions("AI巡检预警系统"));
+    }
+
+    @Bean(value = "biDocApi")
+    public Docket biDocApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(new ApiInfoBuilder()
+                        .title("BI驾驶舱系统")
+                        .description("BI驾驶舱系统")
+                        .termsOfServiceUrl("https://www.xiaonuo.vip")
+                        .contact(new Contact("HUIMV","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
+                        .version("2.0.0")
+                        .build())
+                .globalResponseMessage(RequestMethod.GET, CommonResult.responseList())
+                .globalResponseMessage(RequestMethod.POST, CommonResult.responseList())
+                .groupName("BI驾驶舱系统")
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular.bi"))
+                .paths(PathSelectors.any())
+                .build().extensions(openApiExtensionResolver.buildExtensions("BI驾驶舱系统"));
+    }
+
+    @Bean(value = "energyDocApi")
+    public Docket energyDocApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(new ApiInfoBuilder()
+                        .title("智能能耗系统")
+                        .description("智能能耗系统")
+                        .termsOfServiceUrl("https://www.xiaonuo.vip")
+                        .contact(new Contact("HUIMV","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
+                        .version("2.0.0")
+                        .build())
+                .globalResponseMessage(RequestMethod.GET, CommonResult.responseList())
+                .globalResponseMessage(RequestMethod.POST, CommonResult.responseList())
+                .groupName("智能能耗系统")
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular.energy"))
+                .paths(PathSelectors.any())
+                .build().extensions(openApiExtensionResolver.buildExtensions("智能能耗系统"));
+    }
+
+    @Bean(value = "envDocApi")
+    public Docket envDocApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(new ApiInfoBuilder()
+                        .title("智能环控系统")
+                        .description("智能环控系统")
+                        .termsOfServiceUrl("https://www.xiaonuo.vip")
+                        .contact(new Contact("HUIMV","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
+                        .version("2.0.0")
+                        .build())
+                .globalResponseMessage(RequestMethod.GET, CommonResult.responseList())
+                .globalResponseMessage(RequestMethod.POST, CommonResult.responseList())
+                .groupName("智能环控系统")
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular.env"))
+                .paths(PathSelectors.any())
+                .build().extensions(openApiExtensionResolver.buildExtensions("智能环控系统"));
+    }
+
+    @Bean(value = "cleanDocApi")
+    public Docket cleanDocApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(new ApiInfoBuilder()
+                        .title("智能洗消系统")
+                        .description("智能洗消系统")
+                        .termsOfServiceUrl("https://www.xiaonuo.vip")
+                        .contact(new Contact("HUIMV","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
+                        .version("2.0.0")
+                        .build())
+                .globalResponseMessage(RequestMethod.GET, CommonResult.responseList())
+                .globalResponseMessage(RequestMethod.POST, CommonResult.responseList())
+                .groupName("智能洗消系统")
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular.clean"))
+                .paths(PathSelectors.any())
+                .build().extensions(openApiExtensionResolver.buildExtensions("智能洗消系统"));
+    }
+
+    @Bean(value = "feedDocApi")
+    public Docket feedDocApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(new ApiInfoBuilder()
+                        .title("精准饲喂系统")
+                        .description("精准饲喂系统")
+                        .termsOfServiceUrl("https://www.xiaonuo.vip")
+                        .contact(new Contact("HUIMV","https://www.xiaonuo.vip", "xuyuxiang29@foxmail.com"))
+                        .version("2.0.0")
+                        .build())
+                .globalResponseMessage(RequestMethod.GET, CommonResult.responseList())
+                .globalResponseMessage(RequestMethod.POST, CommonResult.responseList())
+                .groupName("精准饲喂系统")
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage("vip.xiaonuo.modular.feed"))
+                .paths(PathSelectors.any())
+                .build().extensions(openApiExtensionResolver.buildExtensions("精准饲喂系统"));
     }
 }

snowy-web-app/src/main/java/vip/xiaonuo/core/enums/BaseDataTypeEnum.java

@@ -9,13 +9,11 @@ public enum BaseDataTypeEnum {
      */
     PIGPEN("PIGPEN"),
 
-    STAGE("STAGE"),
+    BASE_CONFIG("BASE_CONFIG"),
 
-    INVENTORY("INVENTORY"),
+    INVENTORY_USE("INVENTORY_USE"),
 
-    WAREHOUSE("WAREHOUSE"),
-
-    INVENTORY_IN("INVENTORY_IN");
+    DEPARTMENT("DEPARTMENT");
 
     private final String value;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/controller/BaseConfigController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.controller;
+package vip.xiaonuo.modular.base.baseConfig.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
@@ -26,11 +26,11 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.modular.baseConfig.entity.BaseConfig;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigAddParam;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigEditParam;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigIdParam;
-import vip.xiaonuo.modular.baseConfig.service.BaseConfigService;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigAddParam;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigEditParam;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigIdParam;
+import vip.xiaonuo.modular.base.baseConfig.service.BaseConfigService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/entity/BaseConfig.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.entity;
+package vip.xiaonuo.modular.base.baseConfig.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/enums/BaseConfigEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.enums;
+package vip.xiaonuo.modular.base.baseConfig.enums;
 
 import lombok.Getter;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/mapper/BaseConfigMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.mapper;
+package vip.xiaonuo.modular.base.baseConfig.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.modular.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 
 /**
  * 基础设置Mapper接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/mapper/mapping/BaseConfigMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.modular.baseConfig.mapper.BaseConfigMapper">
+<mapper namespace="vip.xiaonuo.modular.base.baseConfig.mapper.BaseConfigMapper">
 
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/param/BaseConfigAddParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.param;
+package vip.xiaonuo.modular.base.baseConfig.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/param/BaseConfigEditParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.param;
+package vip.xiaonuo.modular.base.baseConfig.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/param/BaseConfigIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.param;
+package vip.xiaonuo.modular.base.baseConfig.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/param/BaseConfigPageParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.param;
+package vip.xiaonuo.modular.base.baseConfig.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/service/BaseConfigService.java

@@ -10,14 +10,14 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.service;
+package vip.xiaonuo.modular.base.baseConfig.service;
 
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.modular.baseConfig.entity.BaseConfig;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigAddParam;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigEditParam;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigIdParam;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigAddParam;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigEditParam;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigIdParam;
 
 import java.util.List;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/baseConfig/service/impl/BaseConfigServiceImpl.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.baseConfig.service.impl;
+package vip.xiaonuo.modular.base.baseConfig.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
@@ -25,13 +25,16 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.exception.CommonException;
-import vip.xiaonuo.modular.baseConfig.entity.BaseConfig;
-import vip.xiaonuo.modular.baseConfig.mapper.BaseConfigMapper;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigAddParam;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigEditParam;
-import vip.xiaonuo.modular.baseConfig.param.BaseConfigIdParam;
-import vip.xiaonuo.modular.baseConfig.service.BaseConfigService;
+import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
+import vip.xiaonuo.core.enums.BaseDataTypeEnum;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.mapper.BaseConfigMapper;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigAddParam;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigEditParam;
+import vip.xiaonuo.modular.base.baseConfig.param.BaseConfigIdParam;
+import vip.xiaonuo.modular.base.baseConfig.service.BaseConfigService;
 
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -66,6 +69,9 @@ public class BaseConfigServiceImpl extends ServiceImpl<BaseConfigMapper, BaseCon
     public void add(BaseConfigAddParam baseConfigAddParam) {
         BaseConfig baseConfig = BeanUtil.toBean(baseConfigAddParam, BaseConfig.class);
         this.save(baseConfig);
+
+        // 发布增加事件
+        CommonDataChangeEventCenter.doAddWithData(BaseDataTypeEnum.BASE_CONFIG.getValue(), JSONUtil.createArray().put(baseConfig));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -74,13 +80,20 @@ public class BaseConfigServiceImpl extends ServiceImpl<BaseConfigMapper, BaseCon
         BaseConfig baseConfig = this.queryEntity(baseConfigEditParam.getId());
         BeanUtil.copyProperties(baseConfigEditParam, baseConfig);
         this.updateById(baseConfig);
+
+        // 发布更新事件
+        CommonDataChangeEventCenter.doUpdateWithData(BaseDataTypeEnum.BASE_CONFIG.getValue(), JSONUtil.createArray().put(baseConfig));
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<BaseConfigIdParam> baseConfigIdParamList) {
+        List<String> toDeleteBaseConfigIdList = CollStreamUtil.toList(baseConfigIdParamList, BaseConfigIdParam::getId);
         // 执行删除
-        this.removeByIds(CollStreamUtil.toList(baseConfigIdParamList, BaseConfigIdParam::getId));
+        this.removeByIds(toDeleteBaseConfigIdList);
+
+        // 发布删除事件
+        CommonDataChangeEventCenter.doDeleteWithDataId(BaseDataTypeEnum.BASE_CONFIG.getValue(), toDeleteBaseConfigIdList);
     }
 
     @Override

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/controller/DepartmentController.java

@@ -10,9 +10,8 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.controller;
+package vip.xiaonuo.modular.base.department.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -24,12 +23,12 @@ import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.modular.department.entity.Department;
-import vip.xiaonuo.modular.department.param.DepartmentAddParam;
-import vip.xiaonuo.modular.department.param.DepartmentEditParam;
-import vip.xiaonuo.modular.department.param.DepartmentIdParam;
-import vip.xiaonuo.modular.department.param.DepartmentPageParam;
-import vip.xiaonuo.modular.department.service.DepartmentService;
+import vip.xiaonuo.modular.base.department.entity.Department;
+import vip.xiaonuo.modular.base.department.param.DepartmentAddParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentEditParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentIdParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentPageParam;
+import vip.xiaonuo.modular.base.department.service.DepartmentService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/entity/Department.java

@@ -10,13 +10,13 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.entity;
+package vip.xiaonuo.modular.base.department.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
+
 import java.util.Date;
 
 /**

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/enums/DepartmentEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.enums;
+package vip.xiaonuo.modular.base.department.enums;
 
 import lombok.Getter;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/mapper/DepartmentMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.mapper;
+package vip.xiaonuo.modular.base.department.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.modular.department.entity.Department;
+import vip.xiaonuo.modular.base.department.entity.Department;
 
 /**
  * 部门Mapper接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/mapper/mapping/DepartmentMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.modular.department.mapper.DepartmentMapper">
+<mapper namespace="vip.xiaonuo.modular.base.department.mapper.DepartmentMapper">
 
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/param/DepartmentAddParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.param;
+package vip.xiaonuo.modular.base.department.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -18,8 +18,6 @@ import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 部门添加参数

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/param/DepartmentEditParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.param;
+package vip.xiaonuo.modular.base.department.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -18,8 +18,6 @@ import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 部门编辑参数

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/param/DepartmentIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.param;
+package vip.xiaonuo.modular.base.department.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/param/DepartmentPageParam.java

@@ -10,13 +10,11 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.param;
+package vip.xiaonuo.modular.base.department.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 部门查询参数

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/service/DepartmentService.java

@@ -10,16 +10,16 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.service;
+package vip.xiaonuo.modular.base.department.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
-import vip.xiaonuo.modular.department.entity.Department;
-import vip.xiaonuo.modular.department.param.DepartmentAddParam;
-import vip.xiaonuo.modular.department.param.DepartmentEditParam;
-import vip.xiaonuo.modular.department.param.DepartmentIdParam;
-import vip.xiaonuo.modular.department.param.DepartmentPageParam;
+import vip.xiaonuo.modular.base.department.entity.Department;
+import vip.xiaonuo.modular.base.department.param.DepartmentAddParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentEditParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentIdParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentPageParam;
 
 import java.util.List;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/department/service/impl/DepartmentServiceImpl.java

@@ -10,12 +10,13 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.department.service.impl;
+package vip.xiaonuo.modular.base.department.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,16 +27,20 @@ import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
+import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
 import vip.xiaonuo.common.page.CommonPageRequest;
+import vip.xiaonuo.core.enums.BaseDataTypeEnum;
 import vip.xiaonuo.dev.modular.file.service.DevFileService;
-import vip.xiaonuo.modular.department.entity.Department;
-import vip.xiaonuo.modular.department.mapper.DepartmentMapper;
-import vip.xiaonuo.modular.department.param.DepartmentAddParam;
-import vip.xiaonuo.modular.department.param.DepartmentEditParam;
-import vip.xiaonuo.modular.department.param.DepartmentIdParam;
-import vip.xiaonuo.modular.department.param.DepartmentPageParam;
-import vip.xiaonuo.modular.department.service.DepartmentService;
+import vip.xiaonuo.modular.base.department.entity.Department;
+import vip.xiaonuo.modular.base.department.mapper.DepartmentMapper;
+import vip.xiaonuo.modular.base.department.param.DepartmentAddParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentEditParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentIdParam;
+import vip.xiaonuo.modular.base.department.param.DepartmentPageParam;
+import vip.xiaonuo.modular.base.department.service.DepartmentService;
+import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -74,6 +79,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             department.setDepartmentImgUrl(uploadReturnUrl);
         }
         this.save(department);
+
+        // 发布增加事件
+        CommonDataChangeEventCenter.doAddWithData(BaseDataTypeEnum.DEPARTMENT.getValue(), JSONUtil.createArray().put(department));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -86,18 +94,25 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             department.setDepartmentImgUrl(uploadReturnUrl);
         }
         this.updateById(department);
+
+        // 发布更新事件
+        CommonDataChangeEventCenter.doUpdateWithData(BaseDataTypeEnum.DEPARTMENT.getValue(), JSONUtil.createArray().put(department));
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<DepartmentIdParam> departmentIdParamList) {
-        for (DepartmentIdParam departmentIdParam : departmentIdParamList) {
-            if (this.count(new QueryWrapper<Department>().eq("parent_id",departmentIdParam.getId())) > 0) {
+        List<String> toDeleteDepartmentIdList = CollStreamUtil.toList(departmentIdParamList, DepartmentIdParam::getId);
+        for (String s : toDeleteDepartmentIdList) {
+            if (this.count(new QueryWrapper<Department>().lambda().eq(Department::getParentId,s)) > 0) {
                 throw new CommonException("部门存在下级,请先删除下级部门!");
             }
         }
         // 执行删除
-        this.removeByIds(CollStreamUtil.toList(departmentIdParamList, DepartmentIdParam::getId));
+        this.removeByIds(toDeleteDepartmentIdList);
+
+        // 发布删除事件
+        CommonDataChangeEventCenter.doDeleteWithDataId(BaseDataTypeEnum.DEPARTMENT.getValue(), toDeleteDepartmentIdList);
     }
 
     @Override

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/controller/InventoryUseController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.controller;
+package vip.xiaonuo.modular.base.inventoryUse.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -23,9 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.modular.inventoryUse.entity.InventoryUse;
-import vip.xiaonuo.modular.inventoryUse.param.*;
-import vip.xiaonuo.modular.inventoryUse.service.InventoryUseService;
+import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.param.*;
+import vip.xiaonuo.modular.base.inventoryUse.service.InventoryUseService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/entity/InventoryUse.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.entity;
+package vip.xiaonuo.modular.base.inventoryUse.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/enums/InventoryUseEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.enums;
+package vip.xiaonuo.modular.base.inventoryUse.enums;
 
 import lombok.Getter;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/mapper/InventoryUseMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.mapper;
+package vip.xiaonuo.modular.base.inventoryUse.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.modular.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
 
 /**
  * 物资领用Mapper接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/mapper/mapping/InventoryUseMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.modular.inventoryUse.mapper.InventoryUseMapper">
+<mapper namespace="vip.xiaonuo.modular.base.inventoryUse.mapper.InventoryUseMapper">
 
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/param/InventoryUseAddParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.param;
+package vip.xiaonuo.modular.base.inventoryUse.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/param/InventoryUseEditParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.param;
+package vip.xiaonuo.modular.base.inventoryUse.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/param/InventoryUseIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.param;
+package vip.xiaonuo.modular.base.inventoryUse.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/param/InventoryUsePageParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.param;
+package vip.xiaonuo.modular.base.inventoryUse.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/param/InventoryUseRevertParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.param;
+package vip.xiaonuo.modular.base.inventoryUse.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/service/InventoryUseService.java

@@ -10,13 +10,13 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.service;
+package vip.xiaonuo.modular.base.inventoryUse.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
-import vip.xiaonuo.modular.inventoryUse.entity.InventoryUse;
-import vip.xiaonuo.modular.inventoryUse.param.*;
+import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.param.*;
 
 import java.util.Date;
 import java.util.List;

snowy-web-app/src/main/java/vip/xiaonuo/modular/inventoryUse/service/impl/InventoryUseServiceImpl.java

@@ -10,12 +10,13 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.inventoryUse.service.impl;
+package vip.xiaonuo.modular.base.inventoryUse.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,13 +26,16 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
+import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
 import vip.xiaonuo.common.page.CommonPageRequest;
+import vip.xiaonuo.core.enums.BaseDataTypeEnum;
 import vip.xiaonuo.dev.modular.file.service.DevFileService;
-import vip.xiaonuo.modular.inventoryUse.entity.InventoryUse;
-import vip.xiaonuo.modular.inventoryUse.mapper.InventoryUseMapper;
-import vip.xiaonuo.modular.inventoryUse.param.*;
-import vip.xiaonuo.modular.inventoryUse.service.InventoryUseService;
+import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.mapper.InventoryUseMapper;
+import vip.xiaonuo.modular.base.inventoryUse.param.*;
+import vip.xiaonuo.modular.base.inventoryUse.service.InventoryUseService;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 import java.util.List;
 
@@ -68,6 +72,9 @@ public class InventoryUseServiceImpl extends ServiceImpl<InventoryUseMapper, Inv
     public void add(InventoryUseAddParam inventoryUseAddParam) {
         InventoryUse inventoryUse = BeanUtil.toBean(inventoryUseAddParam, InventoryUse.class);
         this.save(inventoryUse);
+
+        // 发布增加事件
+        CommonDataChangeEventCenter.doAddWithData(BaseDataTypeEnum.INVENTORY_USE.getValue(), JSONUtil.createArray().put(inventoryUse));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -76,13 +83,20 @@ public class InventoryUseServiceImpl extends ServiceImpl<InventoryUseMapper, Inv
         InventoryUse inventoryUse = this.queryEntity(inventoryUseEditParam.getId());
         BeanUtil.copyProperties(inventoryUseEditParam, inventoryUse);
         this.updateById(inventoryUse);
+
+        // 发布更新事件
+        CommonDataChangeEventCenter.doUpdateWithData(BaseDataTypeEnum.INVENTORY_USE.getValue(), JSONUtil.createArray().put(inventoryUse));
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<InventoryUseIdParam> inventoryUseIdParamList) {
+        List<String> toDeleteInventoryUseIdList = CollStreamUtil.toList(inventoryUseIdParamList, InventoryUseIdParam::getId);
         // 执行删除
-        this.removeByIds(CollStreamUtil.toList(inventoryUseIdParamList, InventoryUseIdParam::getId));
+        this.removeByIds(toDeleteInventoryUseIdList);
+
+        // 发布删除事件
+        CommonDataChangeEventCenter.doDeleteWithDataId(BaseDataTypeEnum.INVENTORY_USE.getValue(), toDeleteInventoryUseIdList);
     }
 
     @Override

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/controller/BasePigpenController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.controller;
+package vip.xiaonuo.modular.base.pigpen.controller;
 
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,12 +26,12 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.modular.pigpen.entity.BasePigpen;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenAddParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenEditParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenIdParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenPageParam;
-import vip.xiaonuo.modular.pigpen.service.BasePigpenService;
+import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenAddParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenEditParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenIdParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenPageParam;
+import vip.xiaonuo.modular.base.pigpen.service.BasePigpenService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/entity/BasePigpen.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.entity;
+package vip.xiaonuo.modular.base.pigpen.entity;
 
 
 import com.baomidou.mybatisplus.annotation.*;

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/enums/BasePigpenTypeEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.enums;
+package vip.xiaonuo.modular.base.pigpen.enums;
 
 import lombok.Getter;
 import vip.xiaonuo.common.exception.CommonException;

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/mapper/BasePigpenMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.mapper;
+package vip.xiaonuo.modular.base.pigpen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.modular.pigpen.entity.BasePigpen;
+import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
 
 
 /**

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/mapper/mapping/InventoryService.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.modular.pigpen.mapper.BasePigpenMapper">
+<mapper namespace="vip.xiaonuo.modular.base.pigpen.mapper.BasePigpenMapper">
 
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/param/BasePigpenAddParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.param;
+package vip.xiaonuo.modular.base.pigpen.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/param/BasePigpenEditParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.param;
+package vip.xiaonuo.modular.base.pigpen.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/param/BasePigpenIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.param;
+package vip.xiaonuo.modular.base.pigpen.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/param/BasePigpenPageParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.param;
+package vip.xiaonuo.modular.base.pigpen.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/service/BasePigpenService.java

@@ -10,15 +10,15 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.service;
+package vip.xiaonuo.modular.base.pigpen.service;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.modular.pigpen.entity.BasePigpen;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenAddParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenEditParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenIdParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenPageParam;
+import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenAddParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenEditParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenIdParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenPageParam;
 
 import java.util.List;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/pigpen/service/impl/BasePigpenServiceImpl.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.pigpen.service.impl;
+package vip.xiaonuo.modular.base.pigpen.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
@@ -34,13 +34,13 @@ import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.core.enums.BaseDataTypeEnum;
-import vip.xiaonuo.modular.pigpen.entity.BasePigpen;
-import vip.xiaonuo.modular.pigpen.mapper.BasePigpenMapper;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenAddParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenEditParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenIdParam;
-import vip.xiaonuo.modular.pigpen.param.BasePigpenPageParam;
-import vip.xiaonuo.modular.pigpen.service.BasePigpenService;
+import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
+import vip.xiaonuo.modular.base.pigpen.mapper.BasePigpenMapper;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenAddParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenEditParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenIdParam;
+import vip.xiaonuo.modular.base.pigpen.param.BasePigpenPageParam;
+import vip.xiaonuo.modular.base.pigpen.service.BasePigpenService;
 import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
 
 
@@ -164,7 +164,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         }
         this.removeByIds(toDeletePigpenIdList);
         // 发布删除事件
-        CommonDataChangeEventCenter.doDeleteWithDataId(SysDataTypeEnum.ORG.getValue(), toDeletePigpenIdList);
+        CommonDataChangeEventCenter.doDeleteWithDataId(BaseDataTypeEnum.PIGPEN.getValue(), toDeletePigpenIdList);
     }
 
     @Override

snowy-web-app/src/main/resources/application.properties

@@ -23,7 +23,7 @@ spring.servlet.multipart.max-file-size=100MB
 # mysql
 spring.datasource.dynamic.datasource.master.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.dynamic.datasource.master.url=jdbc:mysql://localhost:3306/snowy?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
-spring.datasource.dynamic.datasource.master.url=jdbc:mysql://192.168.1.7:3306/huimv_nonkeyuan?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
+spring.datasource.dynamic.datasource.master.url=jdbc:mysql://192.168.1.7:3306/huimv_nongkeyuan?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
 spring.datasource.dynamic.datasource.master.username=root
 spring.datasource.dynamic.datasource.master.password=hm123456
 spring.datasource.dynamic.strict=true