[insert] 启动问题处理

warehouse-admin-component/pom.xml

@@ -25,6 +25,15 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.yr.bluecat.common</groupId>
+			<artifactId>bluecat-common-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.yr.bluecat.common</groupId>
+			<artifactId>bluecat-common-utils</artifactId>
+		</dependency>
+
 
 		<!-- apollo -->
 		<dependency>

warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/auth/EmployeeComponent.java

@@ -15,7 +15,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/auth/OperatorsComponent.java

@@ -15,7 +15,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/auth/UserAccountComponent.java

@@ -18,7 +18,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/purchase/PurchaseOrderAdminComponent.java

@@ -10,7 +10,7 @@ import com.yr.warehouse.admin.component.apollo.ApolloConfigEvent;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 /**

warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/purchase/SupplierPurchaseOrderComponent.java

@@ -14,7 +14,7 @@ import com.yr.warehouse.admin.component.apollo.ApolloConfigEvent;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/data/bo/WarehouseInfoPageBo.java

@@ -2,7 +2,6 @@ package com.yr.warehouse.admin.data.bo;
 
 
 import com.yr.warehouse.admin.data.common.bo.BasePageBo;
-import com.yr.warehouse.admin.data.menu.WarehouseStatusEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -23,7 +22,7 @@ public class WarehouseInfoPageBo extends BasePageBo implements Serializable {
     /**
      * 运营商id
      */
-    private Long operatorId;
+    private Long searchOperatorId;
 
     /**
      * 仓库编码

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/data/config/MybatisPlusConfig.java

@@ -0,0 +1,26 @@
+package com.yr.warehouse.admin.data.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.annotation.MapperScans;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScans({
+        @MapperScan("com.yr.warehouse.admin.data")
+})
+public class MybatisPlusConfig {
+
+    /**
+     * 添加分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));//如果配置多个插件,切记分页最后添加
+        return interceptor;
+    }
+}

warehouse-admin-data/src/main/resources/mapper/warehouse/WarehouseInfoMapper.xml

@@ -32,8 +32,8 @@
     <sql id="authWhere">
         AND (${alias}.operatorChain = #{bo.adminOperatorChain} or ${alias}.operatorChain like CONCAT(#{bo.adminOperatorChain},'-%'))
         <choose>
-            <when test="bo.operatorId != null and bo.operatorId != ''">
-                AND ${alias}.operatorId = #{bo.operatorId}
+            <when test="bo.searchOperatorId != null and bo.searchOperatorId != ''">
+                AND ${alias}.operatorId = #{bo.searchOperatorId}
             </when>
             <otherwise>
                 AND ${alias}.operatorId = #{bo.adminOperatorId}

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/impl/WarehouseInfoServiceImpl.java

@@ -12,10 +12,10 @@ import com.yr.warehouse.admin.data.mapper.WarehouseProductMapper;
 import com.yr.warehouse.admin.data.vo.WarehouseInfoVo;
 import com.yr.warehouse.admin.data.vo.WarehouseProductCountVo;
 import com.yr.warehouse.admin.server.WarehouseInfoService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/WarehouseAdminWebApplication.java

@@ -8,7 +8,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @Slf4j
-@SpringBootApplication(scanBasePackages = {"com.yr.warehouse", "com.yr.prism"}, exclude = {MqttConfig.class})
+@SpringBootApplication(scanBasePackages = {"com.yr.warehouse.admin", "com.yr.prism"}, exclude = {MqttConfig.class})
 @EnableApolloConfig
 @EnableDubbo
 public class WarehouseAdminWebApplication {

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/common/OssController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 运维中心-设备通用接口

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/controller/WarehouseController.java

@@ -81,7 +81,7 @@ public class WarehouseController extends BaseController {
     }
 
     /**
-     * 当前用户所属运营商下的仓库列表-不分页
+     * 当前运营商下的仓库列表-不分页
      * @param adminUserInfo 登录用户信息
      * @return 仓库列表
      */
@@ -91,7 +91,7 @@ public class WarehouseController extends BaseController {
         WarehouseInfoPageBo bo = new WarehouseInfoPageBo();
         bo.setPageNum(1);
         bo.setPageSize(-1);
-        bo.setOperatorId(request.getOperatorId());
+        bo.setSearchOperatorId(request.getOperatorId());
         buildUserInfo(bo, adminUserInfo);
 
         Page<WarehouseInfoVo> page = warehouseInfoService.warehouseInfoPage(bo);

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/request/WarehouseSearchForPageRequest.java

@@ -20,7 +20,7 @@ public class WarehouseSearchForPageRequest extends PageRequest {
     /**
      * 运营商id
      */
-    private Long operatorId;
+    private Long searchOperatorId;
 
     /**
      * 仓库编码