Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_business_back into zhc

data-center-business-controller/src/main/resources/db/migration/V106__level_manager_contact.sql

@@ -0,0 +1,11 @@
+ALTER TABLE dashboard_level_site ADD `manager_contact` varchar(255) DEFAULT NULL COMMENT '管理人员的联系方式';
+ALTER TABLE dashboard_level_site ADD `manager_name` varchar(255) DEFAULT NULL COMMENT '管理人员的名字';
+
+ALTER TABLE dashboard_level_area ADD `manager_contact` varchar(255) DEFAULT NULL COMMENT '管理人员的联系方式';
+ALTER TABLE dashboard_level_area ADD `manager_name` varchar(255) DEFAULT NULL COMMENT '管理人员的名字';
+
+ALTER TABLE dashboard_level_store ADD `manager_contact` varchar(255) DEFAULT NULL COMMENT '管理人员的联系方式';
+ALTER TABLE dashboard_level_store ADD `manager_name` varchar(255) DEFAULT NULL COMMENT '管理人员的名字';
+
+ALTER TABLE dashboard_level_branch ADD `manager_contact` varchar(255) DEFAULT NULL COMMENT '管理人员的联系方式';
+ALTER TABLE dashboard_level_branch ADD `manager_name` varchar(255) DEFAULT NULL COMMENT '管理人员的名字';

data-center-business-controller/src/test/java/com/techsor/datacenter/business/BaseApplicationTests.java

@@ -1,71 +1,71 @@
-package com.techsor.datacenter.business;
+//package com.techsor.datacenter.business;
-
+//
-
+//
-import com.techsor.datacenter.business.entity.gateway.EmqxClientsEntity;
+//import com.techsor.datacenter.business.entity.gateway.EmqxClientsEntity;
-import com.techsor.datacenter.business.model.DeviceConfigInfo;
+//import com.techsor.datacenter.business.model.DeviceConfigInfo;
-import com.techsor.datacenter.business.service.ScheduleLoytechGatewayCheckService;
+//import com.techsor.datacenter.business.service.ScheduleLoytechGatewayCheckService;
-import com.techsor.datacenter.business.util.AlertContentUtils;
+//import com.techsor.datacenter.business.util.AlertContentUtils;
-import org.apache.commons.lang3.ObjectUtils;
+//import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
+//import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.executor.BaseExecutor;
+//import org.apache.ibatis.executor.BaseExecutor;
-import org.junit.Test;
+//import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.stereotype.Component;
+//import org.springframework.stereotype.Component;
-
+//
-import java.time.LocalDate;
+//import java.time.LocalDate;
-import java.time.LocalDateTime;
+//import java.time.LocalDateTime;
-import java.time.ZoneId;
+//import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
+//import java.time.format.DateTimeFormatter;
-import java.util.Locale;
+//import java.util.Locale;
-
+//
-
+//
-
+//
-public class BaseApplicationTests {
+//public class BaseApplicationTests {
-
+//
-    @Test
+//    @Test
-    public void test(){
+//    public void test(){
-        String min=null;
+//        String min=null;
-        String max=null;
+//        String max=null;
-        String[] dbmIdList="[deviceId]_temperature,[deviceId]_humidity".split(",");
+//        String[] dbmIdList="[deviceId]_temperature,[deviceId]_humidity".split(",");
-
+//
-        String[] minList = (min != null) ? min.split(",") : new String[0];
+//        String[] minList = (min != null) ? min.split(",") : new String[0];
-        String[] maxList = (max != null) ? max.split(",") : new String[0];
+//        String[] maxList = (max != null) ? max.split(",") : new String[0];
-        String formatedStr = "";
+//        String formatedStr = "";
-        for (int i=0;i<dbmIdList.length;i++){
+//        for (int i=0;i<dbmIdList.length;i++){
-            String tempMin = AlertContentUtils.MIN;
+//            String tempMin = AlertContentUtils.MIN;
-            String tempMax = AlertContentUtils.MAX;
+//            String tempMax = AlertContentUtils.MAX;
-            if (i<minList.length){
+//            if (i<minList.length){
-                tempMin = minList[i];
+//                tempMin = minList[i];
-            }
+//            }
-            if (i<maxList.length){
+//            if (i<maxList.length){
-                tempMax = maxList[i];
+//                tempMax = maxList[i];
-            }
+//            }
-            formatedStr = formatedStr + "($['"+dbmIdList[i]+"']>="+tempMin+" && $['"+dbmIdList[i]+"']<="+tempMax+") && ";
+//            formatedStr = formatedStr + "($['"+dbmIdList[i]+"']>="+tempMin+" && $['"+dbmIdList[i]+"']<="+tempMax+") && ";
-        }
+//        }
-        formatedStr = formatedStr.substring(0,formatedStr.length()-3);
+//        formatedStr = formatedStr.substring(0,formatedStr.length()-3);
-        formatedStr = formatedStr.replaceAll("\\[deviceId\\]","DDDD");
+//        formatedStr = formatedStr.replaceAll("\\[deviceId\\]","DDDD");
-        formatedStr = formatedStr.replaceAll("\\[deviceSn\\]","DDDD");
+//        formatedStr = formatedStr.replaceAll("\\[deviceSn\\]","DDDD");
-
+//
-
+//
-        System.out.println(formatedStr);
+//        System.out.println(formatedStr);
-    }
+//    }
-
+//
-    private static String defaultIfNull(String value, String defaultValue) {
+//    private static String defaultIfNull(String value, String defaultValue) {
-        return value != null ? value : defaultValue;
+//        return value != null ? value : defaultValue;
-    }
+//    }
-
+//
-    private static String[] ensureLength(String[] original, int minLength) {
+//    private static String[] ensureLength(String[] original, int minLength) {
-        if (original.length >= minLength) {
+//        if (original.length >= minLength) {
-            return original;
+//            return original;
-        }
+//        }
-
+//
-        String[] extended = new String[minLength];
+//        String[] extended = new String[minLength];
-        for (int i = 0; i < original.length; i++) {
+//        for (int i = 0; i < original.length; i++) {
-            extended[i] = original[i];
+//            extended[i] = original[i];
-        }
+//        }
-        for (int i = original.length; i < minLength; i++) {
+//        for (int i = original.length; i < minLength; i++) {
-            extended[i] = "";
+//            extended[i] = "";
-        }
+//        }
-        return extended;
+//        return extended;
-    }
+//    }
-}
+//}

data-center-business-controller/src/test/java/com/techsor/datacenter/business/controller/DataSrcConfigControllerTest.java

@@ -1,38 +1,38 @@
-package com.techsor.datacenter.business.controller;
+//package com.techsor.datacenter.business.controller;
-
+//
-import com.techsor.datacenter.business.dto.datasource.DataSourceConfigSearchParams;
+//import com.techsor.datacenter.business.dto.datasource.DataSourceConfigSearchParams;
-import com.techsor.datacenter.business.service.IDataSourceConfigService;
+//import com.techsor.datacenter.business.service.IDataSourceConfigService;
-import org.junit.Test;
+//import org.junit.Test;
-import org.junit.runner.RunWith;
+//import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+//import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.web.servlet.ResultActions;
+//import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+//import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+//import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+//import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+//import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-
+//
-@ContextConfiguration(classes = {DataSrcConfigController.class})
+//@ContextConfiguration(classes = {DataSrcConfigController.class})
-@RunWith(SpringJUnit4ClassRunner.class)
+//@RunWith(SpringJUnit4ClassRunner.class)
-public class DataSrcConfigControllerTest {
+//public class DataSrcConfigControllerTest {
-    @Autowired
+//    @Autowired
-    private DataSrcConfigController dataSrcConfigController;
+//    private DataSrcConfigController dataSrcConfigController;
-
+//
-    @MockBean
+//    @MockBean
-    private IDataSourceConfigService iDataSourceConfigService;
+//    private IDataSourceConfigService iDataSourceConfigService;
-
+//
-    /**
+//    /**
-     * Method under test: {@link DataSrcConfigController#getListPage(String, String, Long, Long, Integer, Integer, DataSourceConfigSearchParams)} (Long, Long, Integer, DataSourceConfigSearchParams)}
+//     * Method under test: {@link DataSrcConfigController#getListPage(String, String, Long, Long, Integer, Integer, DataSourceConfigSearchParams)} (Long, Long, Integer, DataSourceConfigSearchParams)}
-     */
+//     */
-    @Test
+//    @Test
-    public void testGetListPage() throws Exception {
+//    public void testGetListPage() throws Exception {
-        MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.post("/datasrc/list/page");
+//        MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.post("/datasrc/list/page");
-        ResultActions actualPerformResult = MockMvcBuilders.standaloneSetup(dataSrcConfigController)
+//        ResultActions actualPerformResult = MockMvcBuilders.standaloneSetup(dataSrcConfigController)
-                .build()
+//                .build()
-                .perform(requestBuilder);
+//                .perform(requestBuilder);
-        actualPerformResult.andExpect(MockMvcResultMatchers.status().is(400));
+//        actualPerformResult.andExpect(MockMvcResultMatchers.status().is(400));
-    }
+//    }
-}
+//}
-
+//

data-center-business-controller/src/test/java/com/techsor/datacenter/business/controller/DeviceCategoryControllerTest.java

@@ -1,99 +1,99 @@
-package com.techsor.datacenter.business.controller;
+//package com.techsor.datacenter.business.controller;
-
+//
-import static org.mockito.Mockito.when;
+//import static org.mockito.Mockito.when;
-
+//
-import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fasterxml.jackson.databind.ObjectMapper;
-import com.techsor.datacenter.business.dto.device.DeviceConfigParams;
+//import com.techsor.datacenter.business.dto.device.DeviceConfigParams;
-import com.techsor.datacenter.business.dto.device.DeviceConfigSearchParams;
+//import com.techsor.datacenter.business.dto.device.DeviceConfigSearchParams;
-import com.techsor.datacenter.business.service.IDeviceTypeService;
+//import com.techsor.datacenter.business.service.IDeviceTypeService;
-
+//
-import java.util.ArrayList;
+//import java.util.ArrayList;
-
+//
-import java.util.HashMap;
+//import java.util.HashMap;
-
+//
-import org.junit.Test;
+//import org.junit.Test;
-import org.junit.runner.RunWith;
+//import org.junit.runner.RunWith;
-import org.mockito.Mockito;
+//import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+//import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+//import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.ApplicationContext;
+//import org.springframework.context.ApplicationContext;
-import org.springframework.http.MediaType;
+//import org.springframework.http.MediaType;
-import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.junit4.SpringRunner;
+//import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.servlet.MockMvc;
+//import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.ResultActions;
+//import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+//import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+//import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+//import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+//import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
+//import org.springframework.web.context.WebApplicationContext;
-
+//
-import jakarta.annotation.Resource;
+//import jakarta.annotation.Resource;
-
+//
-
+//
-@RunWith(SpringRunner.class)
+//@RunWith(SpringRunner.class)
-@SpringBootTest
+//@SpringBootTest
-@AutoConfigureMockMvc
+//@AutoConfigureMockMvc
-public class DeviceCategoryControllerTest {
+//public class DeviceCategoryControllerTest {
-
+//
-
+//
-    @Resource
+//    @Resource
-    private IDeviceTypeService iDeviceTypeService;
+//    private IDeviceTypeService iDeviceTypeService;
-
+//
-    @Resource
+//    @Resource
-    private MockMvc mockMvc;
+//    private MockMvc mockMvc;
-    /**
+//    /**
-     * Method under test: {@link DeviceCategoryController#configDeviceInfos(String, String, Long, Long, Integer, Integer, DeviceConfigParams)} (String, Long, Long, Integer, Integer, DeviceConfigParams)}
+//     * Method under test: {@link DeviceCategoryController#configDeviceInfos(String, String, Long, Long, Integer, Integer, DeviceConfigParams)} (String, Long, Long, Integer, Integer, DeviceConfigParams)}
-     */
+//     */
-    @Test
+//    @Test
-    public void testConfigDeviceInfos() throws Exception {
+//    public void testConfigDeviceInfos() throws Exception {
-        DeviceConfigParams deviceConfigParams = new DeviceConfigParams();
+//        DeviceConfigParams deviceConfigParams = new DeviceConfigParams();
-        deviceConfigParams.setDeviceDataSrc("Device Data Src");
+//        deviceConfigParams.setDeviceDataSrc("Device Data Src");
-        deviceConfigParams.setDeviceType("Device Type");
+//        deviceConfigParams.setDeviceType("Device Type");
-        deviceConfigParams.setExpressionMap(new HashMap<>());
+//        deviceConfigParams.setExpressionMap(new HashMap<>());
-        deviceConfigParams.setExpressionVariableMap(new HashMap<>());
+//        deviceConfigParams.setExpressionVariableMap(new HashMap<>());
-        deviceConfigParams.setOriginJsonFormat("Origin Json Format");
+//        deviceConfigParams.setOriginJsonFormat("Origin Json Format");
-        deviceConfigParams.setTargetForwardCode("Target Forward Code");
+//        deviceConfigParams.setTargetForwardCode("Target Forward Code");
-        deviceConfigParams.setTargetJsonFormat("Target Json Format");
+//        deviceConfigParams.setTargetJsonFormat("Target Json Format");
-        String content = (new ObjectMapper()).writeValueAsString(deviceConfigParams);
+//        String content = (new ObjectMapper()).writeValueAsString(deviceConfigParams);
-
+//
-        this.mockMvc.perform(MockMvcRequestBuilders.post("/devicecate/config/deviceInfos/config")
+//        this.mockMvc.perform(MockMvcRequestBuilders.post("/devicecate/config/deviceInfos/config")
-                .contentType(MediaType.APPLICATION_JSON)
+//                .contentType(MediaType.APPLICATION_JSON)
-                .content(content))
+//                .content(content))
-                .andExpect(MockMvcResultMatchers.status().isOk());
+//                .andExpect(MockMvcResultMatchers.status().isOk());
-
+//
-    }
+//    }
-
+//
-    /**
+//    /**
-     * Method under test: {@link DeviceCategoryController#getBuildInFunctionList(String)}
+//     * Method under test: {@link DeviceCategoryController#getBuildInFunctionList(String)}
-     */
+//     */
-    @Test
+//    @Test
-    public void testGetBuildInFunctionList() throws Exception {
+//    public void testGetBuildInFunctionList() throws Exception {
-
+//
-    }
+//    }
-
+//
-    /**
+//    /**
-     * Method under test: {@link DeviceCategoryController#queryBuildInfos(String, Long, Long, Integer, Integer, DeviceConfigSearchParams)}
+//     * Method under test: {@link DeviceCategoryController#queryBuildInfos(String, Long, Long, Integer, Integer, DeviceConfigSearchParams)}
-     */
+//     */
-    @Test
+//    @Test
-    public void testQueryBuildInfos() throws Exception {
+//    public void testQueryBuildInfos() throws Exception {
-        DeviceConfigSearchParams deviceConfigSearchParams = new DeviceConfigSearchParams();
+//        DeviceConfigSearchParams deviceConfigSearchParams = new DeviceConfigSearchParams();
-        deviceConfigSearchParams.setCompanyIdList(new ArrayList<>());
+//        deviceConfigSearchParams.setCompanyIdList(new ArrayList<>());
-        deviceConfigSearchParams.setCompanyIds("Company Ids");
+//        deviceConfigSearchParams.setCompanyIds("Company Ids");
-        deviceConfigSearchParams.setPageNum(10);
+//        deviceConfigSearchParams.setPageNum(10);
-        deviceConfigSearchParams.setPageSize(3);
+//        deviceConfigSearchParams.setPageSize(3);
-        deviceConfigSearchParams.setSpaceIdList(new ArrayList<>());
+//        deviceConfigSearchParams.setSpaceIdList(new ArrayList<>());
-        deviceConfigSearchParams.setSpaceIds("Space Ids");
+//        deviceConfigSearchParams.setSpaceIds("Space Ids");
-        deviceConfigSearchParams.setUserId(1L);
+//        deviceConfigSearchParams.setUserId(1L);
-        String content = (new ObjectMapper()).writeValueAsString(deviceConfigSearchParams);
+//        String content = (new ObjectMapper()).writeValueAsString(deviceConfigSearchParams);
-        this.mockMvc.perform(MockMvcRequestBuilders.post("/devicecate/config/deviceInfos/query")
+//        this.mockMvc.perform(MockMvcRequestBuilders.post("/devicecate/config/deviceInfos/query")
-                .contentType(MediaType.APPLICATION_JSON)
+//                .contentType(MediaType.APPLICATION_JSON)
-                .content(content))
+//                .content(content))
-                .andExpect(MockMvcResultMatchers.status().isOk());
+//                .andExpect(MockMvcResultMatchers.status().isOk());
-
+//
-    }
+//    }
-}
+//}
-
+//

data-center-business-dao/src/main/resources/mappers/auto/DashboardLevelAreaMapper.xml

@@ -17,6 +17,8 @@
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
     <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+    <result column="manager_contact" jdbcType="VARCHAR" property="managerContact" />
+    <result column="manager_name" jdbcType="VARCHAR" property="managerName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -90,7 +92,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, company_id, `name`, code, sort_order, remark, flag, created_by, created_at, updated_at, 
-    updated_by
+    updated_by, manager_contact, manager_name
   </sql>
   <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelAreaExample" resultMap="BaseResultMap">
     <!--
@@ -150,11 +152,13 @@
     insert into dashboard_level_area (company_id, `name`, code, 
       sort_order, remark, flag, 
       created_by, created_at, updated_at, 
-      updated_by)
+      updated_by, manager_contact, manager_name
+      )
     values (#{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{sortOrder,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER}, 
       #{createdBy,jdbcType=BIGINT}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, 
-      #{updatedBy,jdbcType=BIGINT})
+      #{updatedBy,jdbcType=BIGINT}, #{managerContact,jdbcType=VARCHAR}, #{managerName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.DashboardLevelArea">
     <!--
@@ -196,6 +200,12 @@
       <if test="updatedBy != null">
         updated_by,
       </if>
+      <if test="managerContact != null">
+        manager_contact,
+      </if>
+      <if test="managerName != null">
+        manager_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyId != null">
@@ -228,6 +238,12 @@
       <if test="updatedBy != null">
         #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        #{managerName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelAreaExample" resultType="java.lang.Long">
@@ -280,6 +296,12 @@
       <if test="record.updatedBy != null">
         updated_by = #{record.updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="record.managerContact != null">
+        manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="record.managerName != null">
+        manager_name = #{record.managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -301,7 +323,9 @@
       created_by = #{record.createdBy,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=BIGINT},
       updated_at = #{record.updatedAt,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT}
+      updated_by = #{record.updatedBy,jdbcType=BIGINT},
+      manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      manager_name = #{record.managerName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -343,6 +367,12 @@
       <if test="updatedBy != null">
         updated_by = #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        manager_contact = #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        manager_name = #{managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -361,7 +391,9 @@
       created_by = #{createdBy,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT}
+      updated_by = #{updatedBy,jdbcType=BIGINT},
+      manager_contact = #{managerContact,jdbcType=VARCHAR},
+      manager_name = #{managerName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

data-center-business-dao/src/main/resources/mappers/auto/DashboardLevelBranchMapper.xml

@@ -17,6 +17,8 @@
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
     <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+    <result column="manager_contact" jdbcType="VARCHAR" property="managerContact" />
+    <result column="manager_name" jdbcType="VARCHAR" property="managerName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -90,7 +92,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, company_id, `name`, code, sort_order, remark, flag, created_by, created_at, updated_at, 
-    updated_by
+    updated_by, manager_contact, manager_name
   </sql>
   <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelBranchExample" resultMap="BaseResultMap">
     <!--
@@ -150,11 +152,13 @@
     insert into dashboard_level_branch (company_id, `name`, code, 
       sort_order, remark, flag, 
       created_by, created_at, updated_at, 
-      updated_by)
+      updated_by, manager_contact, manager_name
+      )
     values (#{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{sortOrder,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER}, 
       #{createdBy,jdbcType=BIGINT}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, 
-      #{updatedBy,jdbcType=BIGINT})
+      #{updatedBy,jdbcType=BIGINT}, #{managerContact,jdbcType=VARCHAR}, #{managerName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.DashboardLevelBranch">
     <!--
@@ -196,6 +200,12 @@
       <if test="updatedBy != null">
         updated_by,
       </if>
+      <if test="managerContact != null">
+        manager_contact,
+      </if>
+      <if test="managerName != null">
+        manager_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyId != null">
@@ -228,6 +238,12 @@
       <if test="updatedBy != null">
         #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        #{managerName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelBranchExample" resultType="java.lang.Long">
@@ -280,6 +296,12 @@
       <if test="record.updatedBy != null">
         updated_by = #{record.updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="record.managerContact != null">
+        manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="record.managerName != null">
+        manager_name = #{record.managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -301,7 +323,9 @@
       created_by = #{record.createdBy,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=BIGINT},
       updated_at = #{record.updatedAt,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT}
+      updated_by = #{record.updatedBy,jdbcType=BIGINT},
+      manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      manager_name = #{record.managerName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -343,6 +367,12 @@
       <if test="updatedBy != null">
         updated_by = #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        manager_contact = #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        manager_name = #{managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -361,7 +391,9 @@
       created_by = #{createdBy,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT}
+      updated_by = #{updatedBy,jdbcType=BIGINT},
+      manager_contact = #{managerContact,jdbcType=VARCHAR},
+      manager_name = #{managerName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

data-center-business-dao/src/main/resources/mappers/auto/DashboardLevelSiteMapper.xml

@@ -17,6 +17,8 @@
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
     <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+    <result column="manager_contact" jdbcType="VARCHAR" property="managerContact" />
+    <result column="manager_name" jdbcType="VARCHAR" property="managerName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -90,7 +92,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, company_id, `name`, code, sort_order, remark, flag, created_by, created_at, updated_at, 
-    updated_by
+    updated_by, manager_contact, manager_name
   </sql>
   <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelSiteExample" resultMap="BaseResultMap">
     <!--
@@ -150,11 +152,13 @@
     insert into dashboard_level_site (company_id, `name`, code, 
       sort_order, remark, flag, 
       created_by, created_at, updated_at, 
-      updated_by)
+      updated_by, manager_contact, manager_name
+      )
     values (#{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{sortOrder,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER}, 
       #{createdBy,jdbcType=BIGINT}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, 
-      #{updatedBy,jdbcType=BIGINT})
+      #{updatedBy,jdbcType=BIGINT}, #{managerContact,jdbcType=VARCHAR}, #{managerName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.DashboardLevelSite">
     <!--
@@ -196,6 +200,12 @@
       <if test="updatedBy != null">
         updated_by,
       </if>
+      <if test="managerContact != null">
+        manager_contact,
+      </if>
+      <if test="managerName != null">
+        manager_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyId != null">
@@ -228,6 +238,12 @@
       <if test="updatedBy != null">
         #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        #{managerName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelSiteExample" resultType="java.lang.Long">
@@ -280,6 +296,12 @@
       <if test="record.updatedBy != null">
         updated_by = #{record.updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="record.managerContact != null">
+        manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="record.managerName != null">
+        manager_name = #{record.managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -301,7 +323,9 @@
       created_by = #{record.createdBy,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=BIGINT},
       updated_at = #{record.updatedAt,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT}
+      updated_by = #{record.updatedBy,jdbcType=BIGINT},
+      manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      manager_name = #{record.managerName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -343,6 +367,12 @@
       <if test="updatedBy != null">
         updated_by = #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        manager_contact = #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        manager_name = #{managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -361,7 +391,9 @@
       created_by = #{createdBy,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT}
+      updated_by = #{updatedBy,jdbcType=BIGINT},
+      manager_contact = #{managerContact,jdbcType=VARCHAR},
+      manager_name = #{managerName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

data-center-business-dao/src/main/resources/mappers/auto/DashboardLevelStoreMapper.xml

@@ -17,6 +17,8 @@
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
     <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+    <result column="manager_contact" jdbcType="VARCHAR" property="managerContact" />
+    <result column="manager_name" jdbcType="VARCHAR" property="managerName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -90,7 +92,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, company_id, `name`, code, sort_order, remark, flag, created_by, created_at, updated_at, 
-    updated_by
+    updated_by, manager_contact, manager_name
   </sql>
   <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelStoreExample" resultMap="BaseResultMap">
     <!--
@@ -150,11 +152,13 @@
     insert into dashboard_level_store (company_id, `name`, code, 
       sort_order, remark, flag, 
       created_by, created_at, updated_at, 
-      updated_by)
+      updated_by, manager_contact, manager_name
+      )
     values (#{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{sortOrder,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER}, 
       #{createdBy,jdbcType=BIGINT}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, 
-      #{updatedBy,jdbcType=BIGINT})
+      #{updatedBy,jdbcType=BIGINT}, #{managerContact,jdbcType=VARCHAR}, #{managerName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.DashboardLevelStore">
     <!--
@@ -196,6 +200,12 @@
       <if test="updatedBy != null">
         updated_by,
       </if>
+      <if test="managerContact != null">
+        manager_contact,
+      </if>
+      <if test="managerName != null">
+        manager_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyId != null">
@@ -228,6 +238,12 @@
       <if test="updatedBy != null">
         #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        #{managerName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.techsor.datacenter.business.model.DashboardLevelStoreExample" resultType="java.lang.Long">
@@ -280,6 +296,12 @@
       <if test="record.updatedBy != null">
         updated_by = #{record.updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="record.managerContact != null">
+        manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="record.managerName != null">
+        manager_name = #{record.managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -301,7 +323,9 @@
       created_by = #{record.createdBy,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=BIGINT},
       updated_at = #{record.updatedAt,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT}
+      updated_by = #{record.updatedBy,jdbcType=BIGINT},
+      manager_contact = #{record.managerContact,jdbcType=VARCHAR},
+      manager_name = #{record.managerName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -343,6 +367,12 @@
       <if test="updatedBy != null">
         updated_by = #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="managerContact != null">
+        manager_contact = #{managerContact,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        manager_name = #{managerName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -361,7 +391,9 @@
       created_by = #{createdBy,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT}
+      updated_by = #{updatedBy,jdbcType=BIGINT},
+      manager_contact = #{managerContact,jdbcType=VARCHAR},
+      manager_name = #{managerName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

data-center-business-dao/src/main/resources/mappers/ex/LevelMapperExt.xml

@@ -46,7 +46,7 @@
     <insert id="saveLevel" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
         INSERT INTO
         <include refid="selectTable" />
-        (company_id, name, `code`, remark,
+        (company_id, name, `code`, remark, manager_contact, manager_name,
             <if test="sortOrder != null">sort_order,</if>
             created_by, created_at
         )
@@ -62,6 +62,14 @@
             <when test="remark != null and remark != ''">#{remark}</when>
             <otherwise>NULL</otherwise>
         </choose>,
+        <choose>
+            <when test="managerContact != null and managerContact != ''">#{managerContact}</when>
+            <otherwise>NULL</otherwise>
+        </choose>,
+        <choose>
+            <when test="managerName != null and managerName != ''">#{managerName}</when>
+            <otherwise>NULL</otherwise>
+        </choose>,
         <if test="sortOrder != null">#{sortOrder},</if>
         #{createdBy},
         #{createdAt}
@@ -89,6 +97,8 @@
             name = #{name},
             `code` = #{code},
             remark = #{remark},
+            manager_contact = #{managerContact},
+            manager_name = #{managerName},
             <if test="sortOrder != null">
                 sort_order = #{sortOrder},
             </if>
@@ -126,6 +136,8 @@
         base.`code` AS levelCode,
         base.remark,
         base.sort_order,
+        base.manager_contact,
+        base.manager_name,
         base.created_by,
         base.created_at,
         base.updated_by,

data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/LevelEntity.java

@@ -63,5 +63,15 @@ public class LevelEntity {
      */
     private Long updatedBy;
 
+    /**
+     * 管理人员的联系方式
+     */
+    private String managerContact;
+
+    /**
+     * 管理人员的名字
+     */
+    private String managerName;
+
 
 }

data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/OptLevelParam.java

@@ -60,4 +60,10 @@ public class OptLevelParam {
 
     @Schema(description = "所属企业ID",example = "2", hidden = true)
     private Long companyId;
+
+    @Schema(description = "管理人员的联系方式",example = "2cc")
+    private String managerContact;
+
+    @Schema(description = "管理人员的名字",example = "2cc")
+    private String managerName;
 }

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelArea.java

@@ -102,6 +102,24 @@ public class DashboardLevelArea implements Serializable {
      */
     private Long updatedBy;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_area.manager_contact
+     *
+     * @mbg.generated
+     */
+    private String managerContact;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_area.manager_name
+     *
+     * @mbg.generated
+     */
+    private String managerName;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table dashboard_level_area
@@ -374,6 +392,54 @@ public class DashboardLevelArea implements Serializable {
         this.updatedBy = updatedBy;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_area.manager_contact
+     *
+     * @return the value of dashboard_level_area.manager_contact
+     *
+     * @mbg.generated
+     */
+    public String getManagerContact() {
+        return managerContact;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_area.manager_contact
+     *
+     * @param managerContact the value for dashboard_level_area.manager_contact
+     *
+     * @mbg.generated
+     */
+    public void setManagerContact(String managerContact) {
+        this.managerContact = managerContact == null ? null : managerContact.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_area.manager_name
+     *
+     * @return the value of dashboard_level_area.manager_name
+     *
+     * @mbg.generated
+     */
+    public String getManagerName() {
+        return managerName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_area.manager_name
+     *
+     * @param managerName the value for dashboard_level_area.manager_name
+     *
+     * @mbg.generated
+     */
+    public void setManagerName(String managerName) {
+        this.managerName = managerName == null ? null : managerName.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dashboard_level_area
@@ -397,6 +463,8 @@ public class DashboardLevelArea implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", updatedBy=").append(updatedBy);
+        sb.append(", managerContact=").append(managerContact);
+        sb.append(", managerName=").append(managerName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelAreaExample.java

@@ -883,6 +883,146 @@ public class DashboardLevelAreaExample {
             addCriterion("updated_by not between", value1, value2, "updatedBy");
             return (Criteria) this;
         }
+
+        public Criteria andManagerContactIsNull() {
+            addCriterion("manager_contact is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIsNotNull() {
+            addCriterion("manager_contact is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactEqualTo(String value) {
+            addCriterion("manager_contact =", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotEqualTo(String value) {
+            addCriterion("manager_contact <>", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThan(String value) {
+            addCriterion("manager_contact >", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_contact >=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThan(String value) {
+            addCriterion("manager_contact <", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThanOrEqualTo(String value) {
+            addCriterion("manager_contact <=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLike(String value) {
+            addCriterion("manager_contact like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotLike(String value) {
+            addCriterion("manager_contact not like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIn(List<String> values) {
+            addCriterion("manager_contact in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotIn(List<String> values) {
+            addCriterion("manager_contact not in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactBetween(String value1, String value2) {
+            addCriterion("manager_contact between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotBetween(String value1, String value2) {
+            addCriterion("manager_contact not between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNull() {
+            addCriterion("manager_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNotNull() {
+            addCriterion("manager_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameEqualTo(String value) {
+            addCriterion("manager_name =", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotEqualTo(String value) {
+            addCriterion("manager_name <>", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThan(String value) {
+            addCriterion("manager_name >", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_name >=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThan(String value) {
+            addCriterion("manager_name <", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThanOrEqualTo(String value) {
+            addCriterion("manager_name <=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLike(String value) {
+            addCriterion("manager_name like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotLike(String value) {
+            addCriterion("manager_name not like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIn(List<String> values) {
+            addCriterion("manager_name in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotIn(List<String> values) {
+            addCriterion("manager_name not in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameBetween(String value1, String value2) {
+            addCriterion("manager_name between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotBetween(String value1, String value2) {
+            addCriterion("manager_name not between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
     }
 
     /**

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelBranch.java

@@ -102,6 +102,24 @@ public class DashboardLevelBranch implements Serializable {
      */
     private Long updatedBy;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_branch.manager_contact
+     *
+     * @mbg.generated
+     */
+    private String managerContact;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_branch.manager_name
+     *
+     * @mbg.generated
+     */
+    private String managerName;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table dashboard_level_branch
@@ -374,6 +392,54 @@ public class DashboardLevelBranch implements Serializable {
         this.updatedBy = updatedBy;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_branch.manager_contact
+     *
+     * @return the value of dashboard_level_branch.manager_contact
+     *
+     * @mbg.generated
+     */
+    public String getManagerContact() {
+        return managerContact;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_branch.manager_contact
+     *
+     * @param managerContact the value for dashboard_level_branch.manager_contact
+     *
+     * @mbg.generated
+     */
+    public void setManagerContact(String managerContact) {
+        this.managerContact = managerContact == null ? null : managerContact.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_branch.manager_name
+     *
+     * @return the value of dashboard_level_branch.manager_name
+     *
+     * @mbg.generated
+     */
+    public String getManagerName() {
+        return managerName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_branch.manager_name
+     *
+     * @param managerName the value for dashboard_level_branch.manager_name
+     *
+     * @mbg.generated
+     */
+    public void setManagerName(String managerName) {
+        this.managerName = managerName == null ? null : managerName.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dashboard_level_branch
@@ -397,6 +463,8 @@ public class DashboardLevelBranch implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", updatedBy=").append(updatedBy);
+        sb.append(", managerContact=").append(managerContact);
+        sb.append(", managerName=").append(managerName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelBranchExample.java

@@ -883,6 +883,146 @@ public class DashboardLevelBranchExample {
             addCriterion("updated_by not between", value1, value2, "updatedBy");
             return (Criteria) this;
         }
+
+        public Criteria andManagerContactIsNull() {
+            addCriterion("manager_contact is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIsNotNull() {
+            addCriterion("manager_contact is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactEqualTo(String value) {
+            addCriterion("manager_contact =", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotEqualTo(String value) {
+            addCriterion("manager_contact <>", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThan(String value) {
+            addCriterion("manager_contact >", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_contact >=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThan(String value) {
+            addCriterion("manager_contact <", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThanOrEqualTo(String value) {
+            addCriterion("manager_contact <=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLike(String value) {
+            addCriterion("manager_contact like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotLike(String value) {
+            addCriterion("manager_contact not like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIn(List<String> values) {
+            addCriterion("manager_contact in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotIn(List<String> values) {
+            addCriterion("manager_contact not in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactBetween(String value1, String value2) {
+            addCriterion("manager_contact between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotBetween(String value1, String value2) {
+            addCriterion("manager_contact not between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNull() {
+            addCriterion("manager_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNotNull() {
+            addCriterion("manager_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameEqualTo(String value) {
+            addCriterion("manager_name =", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotEqualTo(String value) {
+            addCriterion("manager_name <>", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThan(String value) {
+            addCriterion("manager_name >", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_name >=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThan(String value) {
+            addCriterion("manager_name <", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThanOrEqualTo(String value) {
+            addCriterion("manager_name <=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLike(String value) {
+            addCriterion("manager_name like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotLike(String value) {
+            addCriterion("manager_name not like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIn(List<String> values) {
+            addCriterion("manager_name in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotIn(List<String> values) {
+            addCriterion("manager_name not in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameBetween(String value1, String value2) {
+            addCriterion("manager_name between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotBetween(String value1, String value2) {
+            addCriterion("manager_name not between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
     }
 
     /**

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelSite.java

@@ -102,6 +102,24 @@ public class DashboardLevelSite implements Serializable {
      */
     private Long updatedBy;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_site.manager_contact
+     *
+     * @mbg.generated
+     */
+    private String managerContact;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_site.manager_name
+     *
+     * @mbg.generated
+     */
+    private String managerName;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table dashboard_level_site
@@ -374,6 +392,54 @@ public class DashboardLevelSite implements Serializable {
         this.updatedBy = updatedBy;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_site.manager_contact
+     *
+     * @return the value of dashboard_level_site.manager_contact
+     *
+     * @mbg.generated
+     */
+    public String getManagerContact() {
+        return managerContact;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_site.manager_contact
+     *
+     * @param managerContact the value for dashboard_level_site.manager_contact
+     *
+     * @mbg.generated
+     */
+    public void setManagerContact(String managerContact) {
+        this.managerContact = managerContact == null ? null : managerContact.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_site.manager_name
+     *
+     * @return the value of dashboard_level_site.manager_name
+     *
+     * @mbg.generated
+     */
+    public String getManagerName() {
+        return managerName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_site.manager_name
+     *
+     * @param managerName the value for dashboard_level_site.manager_name
+     *
+     * @mbg.generated
+     */
+    public void setManagerName(String managerName) {
+        this.managerName = managerName == null ? null : managerName.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dashboard_level_site
@@ -397,6 +463,8 @@ public class DashboardLevelSite implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", updatedBy=").append(updatedBy);
+        sb.append(", managerContact=").append(managerContact);
+        sb.append(", managerName=").append(managerName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelSiteExample.java

@@ -883,6 +883,146 @@ public class DashboardLevelSiteExample {
             addCriterion("updated_by not between", value1, value2, "updatedBy");
             return (Criteria) this;
         }
+
+        public Criteria andManagerContactIsNull() {
+            addCriterion("manager_contact is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIsNotNull() {
+            addCriterion("manager_contact is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactEqualTo(String value) {
+            addCriterion("manager_contact =", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotEqualTo(String value) {
+            addCriterion("manager_contact <>", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThan(String value) {
+            addCriterion("manager_contact >", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_contact >=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThan(String value) {
+            addCriterion("manager_contact <", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThanOrEqualTo(String value) {
+            addCriterion("manager_contact <=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLike(String value) {
+            addCriterion("manager_contact like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotLike(String value) {
+            addCriterion("manager_contact not like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIn(List<String> values) {
+            addCriterion("manager_contact in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotIn(List<String> values) {
+            addCriterion("manager_contact not in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactBetween(String value1, String value2) {
+            addCriterion("manager_contact between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotBetween(String value1, String value2) {
+            addCriterion("manager_contact not between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNull() {
+            addCriterion("manager_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNotNull() {
+            addCriterion("manager_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameEqualTo(String value) {
+            addCriterion("manager_name =", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotEqualTo(String value) {
+            addCriterion("manager_name <>", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThan(String value) {
+            addCriterion("manager_name >", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_name >=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThan(String value) {
+            addCriterion("manager_name <", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThanOrEqualTo(String value) {
+            addCriterion("manager_name <=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLike(String value) {
+            addCriterion("manager_name like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotLike(String value) {
+            addCriterion("manager_name not like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIn(List<String> values) {
+            addCriterion("manager_name in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotIn(List<String> values) {
+            addCriterion("manager_name not in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameBetween(String value1, String value2) {
+            addCriterion("manager_name between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotBetween(String value1, String value2) {
+            addCriterion("manager_name not between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
     }
 
     /**

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelStore.java

@@ -102,6 +102,24 @@ public class DashboardLevelStore implements Serializable {
      */
     private Long updatedBy;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_store.manager_contact
+     *
+     * @mbg.generated
+     */
+    private String managerContact;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_level_store.manager_name
+     *
+     * @mbg.generated
+     */
+    private String managerName;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table dashboard_level_store
@@ -374,6 +392,54 @@ public class DashboardLevelStore implements Serializable {
         this.updatedBy = updatedBy;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_store.manager_contact
+     *
+     * @return the value of dashboard_level_store.manager_contact
+     *
+     * @mbg.generated
+     */
+    public String getManagerContact() {
+        return managerContact;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_store.manager_contact
+     *
+     * @param managerContact the value for dashboard_level_store.manager_contact
+     *
+     * @mbg.generated
+     */
+    public void setManagerContact(String managerContact) {
+        this.managerContact = managerContact == null ? null : managerContact.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_level_store.manager_name
+     *
+     * @return the value of dashboard_level_store.manager_name
+     *
+     * @mbg.generated
+     */
+    public String getManagerName() {
+        return managerName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_level_store.manager_name
+     *
+     * @param managerName the value for dashboard_level_store.manager_name
+     *
+     * @mbg.generated
+     */
+    public void setManagerName(String managerName) {
+        this.managerName = managerName == null ? null : managerName.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dashboard_level_store
@@ -397,6 +463,8 @@ public class DashboardLevelStore implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", updatedBy=").append(updatedBy);
+        sb.append(", managerContact=").append(managerContact);
+        sb.append(", managerName=").append(managerName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DashboardLevelStoreExample.java

@@ -883,6 +883,146 @@ public class DashboardLevelStoreExample {
             addCriterion("updated_by not between", value1, value2, "updatedBy");
             return (Criteria) this;
         }
+
+        public Criteria andManagerContactIsNull() {
+            addCriterion("manager_contact is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIsNotNull() {
+            addCriterion("manager_contact is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactEqualTo(String value) {
+            addCriterion("manager_contact =", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotEqualTo(String value) {
+            addCriterion("manager_contact <>", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThan(String value) {
+            addCriterion("manager_contact >", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_contact >=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThan(String value) {
+            addCriterion("manager_contact <", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLessThanOrEqualTo(String value) {
+            addCriterion("manager_contact <=", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactLike(String value) {
+            addCriterion("manager_contact like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotLike(String value) {
+            addCriterion("manager_contact not like", value, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactIn(List<String> values) {
+            addCriterion("manager_contact in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotIn(List<String> values) {
+            addCriterion("manager_contact not in", values, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactBetween(String value1, String value2) {
+            addCriterion("manager_contact between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerContactNotBetween(String value1, String value2) {
+            addCriterion("manager_contact not between", value1, value2, "managerContact");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNull() {
+            addCriterion("manager_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIsNotNull() {
+            addCriterion("manager_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameEqualTo(String value) {
+            addCriterion("manager_name =", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotEqualTo(String value) {
+            addCriterion("manager_name <>", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThan(String value) {
+            addCriterion("manager_name >", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameGreaterThanOrEqualTo(String value) {
+            addCriterion("manager_name >=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThan(String value) {
+            addCriterion("manager_name <", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLessThanOrEqualTo(String value) {
+            addCriterion("manager_name <=", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameLike(String value) {
+            addCriterion("manager_name like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotLike(String value) {
+            addCriterion("manager_name not like", value, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameIn(List<String> values) {
+            addCriterion("manager_name in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotIn(List<String> values) {
+            addCriterion("manager_name not in", values, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameBetween(String value1, String value2) {
+            addCriterion("manager_name between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andManagerNameNotBetween(String value1, String value2) {
+            addCriterion("manager_name not between", value1, value2, "managerName");
+            return (Criteria) this;
+        }
     }
 
     /**

data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/level/LevelPageDTO.java

@@ -64,4 +64,10 @@ public class LevelPageDTO {
     @Schema(description = "创建时间，毫秒级时间戳",example = "2")
     private Long createdAt;
 
+    @Schema(description = "管理人员的联系方式",example = "2cc")
+    private String managerContact;
+
+    @Schema(description = "管理人员的名字",example = "2cc")
+    private String managerName;
+
 }

data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/LevelServiceImpl.java

@@ -166,6 +166,12 @@ public class LevelServiceImpl implements LevelService {
             levelEntity.setName(param.getLevelName());
             levelEntity.setUpdatedBy(userId);
             levelEntity.setUpdatedAt(currentUnix);
+            if (StringUtils.isBlank(param.getManagerContact())){
+                levelEntity.setManagerContact("");
+            }
+            if (StringUtils.isBlank(param.getManagerName())){
+                levelEntity.setManagerName("");
+            }
             levelMapperExt.updateLevel(levelEntity);
 
             if (1 != param.getLevelType()){

data-center-business-service/src/test/java/com/techsor/datacenter/business/service/impl/DataSourceConfigServiceImplTest.java

@@ -1,352 +1,356 @@
-package com.techsor.datacenter.business.service.impl;
+//package com.techsor.datacenter.business.service.impl;
-
+//
-import static org.junit.Assert.assertEquals;
+//import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+//import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+//import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.atLeast;
+//import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doNothing;
+//import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
+//import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+//import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+//import static org.mockito.Mockito.when;
-
+//
-import com.techsor.datacenter.business.common.response.PageInfo;
+//import com.techsor.datacenter.business.common.language.msg.MsgLanguageChange; // 导入
-import com.techsor.datacenter.business.common.response.SimpleDataResponse;
+//import com.techsor.datacenter.business.common.response.PageInfo;
-import com.techsor.datacenter.business.dao.ex.DataSourceConfigMapperExt;
+//import com.techsor.datacenter.business.common.response.SimpleDataResponse;
-import com.techsor.datacenter.business.dto.datasource.DataSourceConfigSearchParams;
+//import com.techsor.datacenter.business.dao.ex.DataSourceConfigMapperExt;
-import com.techsor.datacenter.business.model.DataSourceConfig;
+//import com.techsor.datacenter.business.dto.datasource.DataSourceConfigSearchParams;
-import com.techsor.datacenter.business.service.IDataSourceConfigService;
+//import com.techsor.datacenter.business.model.DataSourceConfig;
-import com.techsor.datacenter.business.service.common.CommonOpt;
+//import com.techsor.datacenter.business.service.IDataSourceConfigService;
-import com.techsor.datacenter.business.vo.datasrc.DataSourceConfigVO;
+//import com.techsor.datacenter.business.service.common.CommonOpt;
-
+//import com.techsor.datacenter.business.vo.datasrc.DataSourceConfigVO;
-import java.time.LocalDate;
+//
-import java.time.ZoneOffset;
+//import java.time.LocalDate;
-import java.util.ArrayList;
+//import java.time.ZoneOffset;
-import java.util.Arrays;
+//import java.util.ArrayList;
-import java.util.Date;
+//import java.util.Arrays;
-import java.util.List;
+//import java.util.Date;
-
+//import java.util.List;
-import org.apache.commons.collections4.CollectionUtils;
+//
-import org.junit.Test;
+//import org.apache.commons.collections4.CollectionUtils;
-import org.junit.runner.RunWith;
+//import org.junit.Test;
-import org.mockito.Mockito;
+//import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.MockBean;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import jakarta.annotation.Resource;
+//
-
+//// 注意：不再使用 @ContextConfiguration，改用 @SpringBootTest
-@ContextConfiguration(classes = {DataSourceConfigServiceImpl.class})
+//@SpringBootTest(classes = {DataSourceConfigServiceImpl.class})  // 只加载被测服务
-@RunWith(SpringJUnit4ClassRunner.class)
+//@RunWith(SpringJUnit4ClassRunner.class)  // 保留 JUnit 4 运行器
-public class DataSourceConfigServiceImplTest {
+//public class DataSourceConfigServiceImplTest {
-    @MockBean
+//
-    private CommonOpt commonOpt;
+//    @MockitoBean
-
+//    private CommonOpt commonOpt;                       // 已模拟
-    @MockBean
+//
-    private DataSourceConfigMapperExt dataSourceConfigMapperExt;
+//    @MockitoBean
-
+//    private DataSourceConfigMapperExt dataSourceConfigMapperExt; // 已模拟
-    @Autowired
+//
-    private IDataSourceConfigService dataSourceConfigService;
+//    @MockitoBean
-
+//    private MsgLanguageChange msgLanguageChange;      // ⬅️ 新增：模拟缺失的 Bean
-
+//
-    @Test
+//    @Autowired
-    public void testGetPageList(){
+//    private IDataSourceConfigService dataSourceConfigService;
-
+//
-        DataSourceConfigSearchParams dataSourceConfigSearchParams=new DataSourceConfigSearchParams();
+//
-        dataSourceConfigSearchParams.setCompanyIdList(Arrays.asList(1L));
+//    @Test
-        List<DataSourceConfigVO> resultList= this.dataSourceConfigMapperExt.getListPage(dataSourceConfigSearchParams);
+//    public void testGetPageList(){
-
+//
-        assertEquals("结果集大于1", CollectionUtils.size(resultList)>0,true);
+//        DataSourceConfigSearchParams dataSourceConfigSearchParams=new DataSourceConfigSearchParams();
-    }
+//        dataSourceConfigSearchParams.setCompanyIdList(Arrays.asList(1L));
-
+//        List<DataSourceConfigVO> resultList= this.dataSourceConfigMapperExt.getListPage(dataSourceConfigSearchParams);
-
+//
-    /**
+//        assertEquals("结果集大于1", CollectionUtils.size(resultList)>0,true);
-     * Method under test: {@link DataSourceConfigServiceImpl#switchState(Long, Long, Long, Integer)}
+//    }
-     */
+//
-    @Test
+//
-    public void testSwitchState() {
+//    /**
-        DataSourceConfig dataSourceConfig = new DataSourceConfig();
+//     * Method under test: {@link DataSourceConfigServiceImpl#switchState(Long, Long, Long, Integer)}
-        dataSourceConfig.setApiKey("Api Key");
+//     */
-        dataSourceConfig.setCode("Code");
+//    @Test
-        dataSourceConfig.setCompanyId(1L);
+//    public void testSwitchState() {
-        dataSourceConfig.setCreatedBy(1L);
+//        DataSourceConfig dataSourceConfig = new DataSourceConfig();
-        dataSourceConfig
+//        dataSourceConfig.setApiKey("Api Key");
-                .setCreatedTimestamp(Date.from(LocalDate.of(1970, 1, 1).atStartOfDay().atZone(ZoneOffset.UTC).toInstant()));
+//        dataSourceConfig.setCode("Code");
-        dataSourceConfig.setId(1L);
+//        dataSourceConfig.setCompanyId(1L);
-        dataSourceConfig.setMethodType("Method Type");
+//        dataSourceConfig.setCreatedBy(1L);
-        dataSourceConfig.setName("Name");
+//        dataSourceConfig
-        dataSourceConfig.setParams("Params");
+//                .setCreatedTimestamp(Date.from(LocalDate.of(1970, 1, 1).atStartOfDay().atZone(ZoneOffset.UTC).toInstant()));
-        dataSourceConfig.setState("MD");
+//        dataSourceConfig.setId(1L);
-        dataSourceConfig.setUpdatedBy(1L);
+//        dataSourceConfig.setMethodType("Method Type");
-        dataSourceConfig
+//        dataSourceConfig.setName("Name");
-                .setUpdatedTimestamp(Date.from(LocalDate.of(1970, 1, 1).atStartOfDay().atZone(ZoneOffset.UTC).toInstant()));
+//        dataSourceConfig.setParams("Params");
-        when(dataSourceConfigMapperExt.selectByPrimaryKey(Mockito.<Long>any())).thenReturn(dataSourceConfig);
+//        dataSourceConfig.setState("MD");
-        SimpleDataResponse actualSwitchStateResult = dataSourceConfigService.switchState(1L, 1L, 1L, 1);
+//        dataSourceConfig.setUpdatedBy(1L);
-        assertEquals(20002, actualSwitchStateResult.getCode());
+//        dataSourceConfig
-        assertEquals("公司数据源不允许操作", actualSwitchStateResult.getMsg());
+//                .setUpdatedTimestamp(Date.from(LocalDate.of(1970, 1, 1).atStartOfDay().atZone(ZoneOffset.UTC).toInstant()));
-        verify(dataSourceConfigMapperExt).selectByPrimaryKey(Mockito.<Long>any());
+//        when(dataSourceConfigMapperExt.selectByPrimaryKey(Mockito.<Long>any())).thenReturn(dataSourceConfig);
-    }
+//        SimpleDataResponse actualSwitchStateResult = dataSourceConfigService.switchState(1L, 1L, 1L, 1);
-
+//        assertEquals(20002, actualSwitchStateResult.getCode());
-    /**
+//        assertEquals("公司数据源不允许操作", actualSwitchStateResult.getMsg());
-     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
+//        verify(dataSourceConfigMapperExt).selectByPrimaryKey(Mockito.<Long>any());
-     */
+//    }
-    @Test
+//
-    public void testGetListPage() {
+//    /**
-
+//     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
-
+//     */
-        DataSourceConfigSearchParams dataSourceConfigSearchParams = new DataSourceConfigSearchParams();
+//    @Test
-        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
+//    public void testGetListPage() {
-        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
+//
-        dataSourceConfigSearchParams.setPageNum(10);
+//
-        dataSourceConfigSearchParams.setPageSize(3);
+//        DataSourceConfigSearchParams dataSourceConfigSearchParams = new DataSourceConfigSearchParams();
-        dataSourceConfigSearchParams.setUserId(1L);
+//        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
-        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
+//        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
-                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
+//        dataSourceConfigSearchParams.setPageNum(10);
-        assertEquals(0L, actualListPage.getEndRow());
+//        dataSourceConfigSearchParams.setPageSize(3);
-    }
+//        dataSourceConfigSearchParams.setUserId(1L);
-
+//        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
-    /**
+//                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
-     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
+//        assertEquals(0L, actualListPage.getEndRow());
-     */
+//    }
-    @Test
+//
-    public void testGetListPage2() {
+//    /**
-        when(commonOpt.filterCompanyIds(Mockito.<Long>any(), Mockito.<String>any())).thenReturn(new ArrayList<>());
+//     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
-
+//     */
-        DataSourceConfigVO dataSourceConfigVO = new DataSourceConfigVO();
+//    @Test
-        dataSourceConfigVO.setApiKey("Api Key");
+//    public void testGetListPage2() {
-        dataSourceConfigVO.setCode("Code");
+//        when(commonOpt.filterCompanyIds(Mockito.<Long>any(), Mockito.<String>any())).thenReturn(new ArrayList<>());
-        dataSourceConfigVO.setId(1L);
+//
-        dataSourceConfigVO.setMethodType("Method Type");
+//        DataSourceConfigVO dataSourceConfigVO = new DataSourceConfigVO();
-        dataSourceConfigVO.setName("Name");
+//        dataSourceConfigVO.setApiKey("Api Key");
-        dataSourceConfigVO.setParams("Params");
+//        dataSourceConfigVO.setCode("Code");
-        dataSourceConfigVO.setState("MD");
+//        dataSourceConfigVO.setId(1L);
-
+//        dataSourceConfigVO.setMethodType("Method Type");
-        ArrayList<DataSourceConfigVO> dataSourceConfigVOList = new ArrayList<>();
+//        dataSourceConfigVO.setName("Name");
-        dataSourceConfigVOList.add(dataSourceConfigVO);
+//        dataSourceConfigVO.setParams("Params");
-        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
+//        dataSourceConfigVO.setState("MD");
-                .thenReturn(dataSourceConfigVOList);
+//
-
+//        ArrayList<DataSourceConfigVO> dataSourceConfigVOList = new ArrayList<>();
-        DataSourceConfigSearchParams dataSourceConfigSearchParams = new DataSourceConfigSearchParams();
+//        dataSourceConfigVOList.add(dataSourceConfigVO);
-        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
+//        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
-        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
+//                .thenReturn(dataSourceConfigVOList);
-        dataSourceConfigSearchParams.setPageNum(10);
+//
-        dataSourceConfigSearchParams.setPageSize(3);
+//        DataSourceConfigSearchParams dataSourceConfigSearchParams = new DataSourceConfigSearchParams();
-        dataSourceConfigSearchParams.setUserId(1L);
+//        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
-        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
+//        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
-                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
+//        dataSourceConfigSearchParams.setPageNum(10);
-        assertEquals(0L, actualListPage.getEndRow());
+//        dataSourceConfigSearchParams.setPageSize(3);
-        assertTrue(actualListPage.isIsLastPage());
+//        dataSourceConfigSearchParams.setUserId(1L);
-        assertTrue(actualListPage.isIsFirstPage());
+//        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
-        assertFalse(actualListPage.isHasPreviousPage());
+//                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
-        assertFalse(actualListPage.isHasNextPage());
+//        assertEquals(0L, actualListPage.getEndRow());
-        assertEquals(1L, actualListPage.getTotal());
+//        assertTrue(actualListPage.isIsLastPage());
-        assertEquals(0L, actualListPage.getStartRow());
+//        assertTrue(actualListPage.isIsFirstPage());
-        assertEquals(1, actualListPage.getSize());
+//        assertFalse(actualListPage.isHasPreviousPage());
-        assertEquals(1, actualListPage.getPages());
+//        assertFalse(actualListPage.isHasNextPage());
-        assertEquals(1, actualListPage.getPageSize());
+//        assertEquals(1L, actualListPage.getTotal());
-        assertEquals(1, actualListPage.getPageNum());
+//        assertEquals(0L, actualListPage.getStartRow());
-        int[] navigatepageNums = actualListPage.getNavigatepageNums();
+//        assertEquals(1, actualListPage.getSize());
-        assertEquals(1, navigatepageNums.length);
+//        assertEquals(1, actualListPage.getPages());
-        assertEquals(8, actualListPage.getNavigatePages());
+//        assertEquals(1, actualListPage.getPageSize());
-        assertEquals(1, actualListPage.getNavigateFirstPage());
+//        assertEquals(1, actualListPage.getPageNum());
-        assertEquals(1, actualListPage.getNavigateLastPage());
+//        int[] navigatepageNums = actualListPage.getNavigatepageNums();
-        assertEquals(1, actualListPage.getList().size());
+//        assertEquals(1, navigatepageNums.length);
-        assertEquals(1, navigatepageNums[0]);
+//        assertEquals(8, actualListPage.getNavigatePages());
-        verify(commonOpt).filterCompanyIds(Mockito.<Long>any(), Mockito.<String>any());
+//        assertEquals(1, actualListPage.getNavigateFirstPage());
-        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
+//        assertEquals(1, actualListPage.getNavigateLastPage());
-        assertTrue(dataSourceConfigSearchParams.getCompanyIdList().isEmpty());
+//        assertEquals(1, actualListPage.getList().size());
-    }
+//        assertEquals(1, navigatepageNums[0]);
-
+//        verify(commonOpt).filterCompanyIds(Mockito.<Long>any(), Mockito.<String>any());
-    /**
+//        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
-     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
+//        assertTrue(dataSourceConfigSearchParams.getCompanyIdList().isEmpty());
-     */
+//    }
-    @Test
+//
-    public void testGetListPage3() {
+//    /**
-        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
+//     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
-                .thenReturn(new ArrayList<>());
+//     */
-        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
+//    @Test
-        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(10);
+//    public void testGetListPage3() {
-        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(3);
+//        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
-        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn("");
+//                .thenReturn(new ArrayList<>());
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
+//        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(10);
-        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(3);
-        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn("");
-        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
-        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
+//        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageNum(10);
+//        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageSize(3);
+//        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
-        dataSourceConfigSearchParams.setUserId(1L);
+//        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
-        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
+//        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
-                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
+//        dataSourceConfigSearchParams.setPageNum(10);
-        assertEquals(0L, actualListPage.getEndRow());
+//        dataSourceConfigSearchParams.setPageSize(3);
-        assertTrue(actualListPage.isIsLastPage());
+//        dataSourceConfigSearchParams.setUserId(1L);
-        assertTrue(actualListPage.isIsFirstPage());
+//        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
-        assertFalse(actualListPage.isHasPreviousPage());
+//                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
-        assertFalse(actualListPage.isHasNextPage());
+//        assertEquals(0L, actualListPage.getEndRow());
-        assertEquals(0L, actualListPage.getTotal());
+//        assertTrue(actualListPage.isIsLastPage());
-        assertEquals(0L, actualListPage.getStartRow());
+//        assertTrue(actualListPage.isIsFirstPage());
-        assertEquals(0, actualListPage.getSize());
+//        assertFalse(actualListPage.isHasPreviousPage());
-        assertEquals(0, actualListPage.getPages());
+//        assertFalse(actualListPage.isHasNextPage());
-        assertEquals(0, actualListPage.getPageSize());
+//        assertEquals(0L, actualListPage.getTotal());
-        assertEquals(1, actualListPage.getPageNum());
+//        assertEquals(0L, actualListPage.getStartRow());
-        assertEquals(0, actualListPage.getNavigatepageNums().length);
+//        assertEquals(0, actualListPage.getSize());
-        assertEquals(8, actualListPage.getNavigatePages());
+//        assertEquals(0, actualListPage.getPages());
-        assertTrue(actualListPage.getList().isEmpty());
+//        assertEquals(0, actualListPage.getPageSize());
-        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
+//        assertEquals(1, actualListPage.getPageNum());
-        verify(dataSourceConfigSearchParams, atLeast(1)).getPageNum();
+//        assertEquals(0, actualListPage.getNavigatepageNums().length);
-        verify(dataSourceConfigSearchParams, atLeast(1)).getPageSize();
+//        assertEquals(8, actualListPage.getNavigatePages());
-        verify(dataSourceConfigSearchParams).getCompanyIds();
+//        assertTrue(actualListPage.getList().isEmpty());
-        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
+//        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
-        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).getPageNum();
-        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).getPageSize();
-        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams).getCompanyIds();
-        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
-    }
+//        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-
+//        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-    /**
+//        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
-     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
+//        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
-     */
+//    }
-    @Test
+//
-    public void testGetListPage4() {
+//    /**
-        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
+//     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
-                .thenReturn(new ArrayList<>());
+//     */
-        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
+//    @Test
-        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(null);
+//    public void testGetListPage4() {
-        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(3);
+//        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
-        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn("");
+//                .thenReturn(new ArrayList<>());
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
+//        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(null);
-        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(3);
-        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn("");
-        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
-        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
+//        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageNum(10);
+//        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageSize(3);
+//        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
-        dataSourceConfigSearchParams.setUserId(1L);
+//        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
-        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
+//        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
-                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
+//        dataSourceConfigSearchParams.setPageNum(10);
-        assertEquals(0L, actualListPage.getEndRow());
+//        dataSourceConfigSearchParams.setPageSize(3);
-        assertTrue(actualListPage.isIsLastPage());
+//        dataSourceConfigSearchParams.setUserId(1L);
-        assertTrue(actualListPage.isIsFirstPage());
+//        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
-        assertFalse(actualListPage.isHasPreviousPage());
+//                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
-        assertFalse(actualListPage.isHasNextPage());
+//        assertEquals(0L, actualListPage.getEndRow());
-        assertEquals(0L, actualListPage.getTotal());
+//        assertTrue(actualListPage.isIsLastPage());
-        assertEquals(0L, actualListPage.getStartRow());
+//        assertTrue(actualListPage.isIsFirstPage());
-        assertEquals(0, actualListPage.getSize());
+//        assertFalse(actualListPage.isHasPreviousPage());
-        assertEquals(0, actualListPage.getPages());
+//        assertFalse(actualListPage.isHasNextPage());
-        assertEquals(0, actualListPage.getPageSize());
+//        assertEquals(0L, actualListPage.getTotal());
-        assertEquals(1, actualListPage.getPageNum());
+//        assertEquals(0L, actualListPage.getStartRow());
-        assertEquals(0, actualListPage.getNavigatepageNums().length);
+//        assertEquals(0, actualListPage.getSize());
-        assertEquals(8, actualListPage.getNavigatePages());
+//        assertEquals(0, actualListPage.getPages());
-        assertTrue(actualListPage.getList().isEmpty());
+//        assertEquals(0, actualListPage.getPageSize());
-        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
+//        assertEquals(1, actualListPage.getPageNum());
-        verify(dataSourceConfigSearchParams).getPageNum();
+//        assertEquals(0, actualListPage.getNavigatepageNums().length);
-        verify(dataSourceConfigSearchParams, atLeast(1)).getPageSize();
+//        assertEquals(8, actualListPage.getNavigatePages());
-        verify(dataSourceConfigSearchParams).getCompanyIds();
+//        assertTrue(actualListPage.getList().isEmpty());
-        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
+//        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
-        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        verify(dataSourceConfigSearchParams).getPageNum();
-        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).getPageSize();
-        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams).getCompanyIds();
-        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
-    }
+//        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-
+//        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-    /**
+//        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
-     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
+//        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
-     */
+//    }
-    @Test
+//
-    public void testGetListPage5() {
+//    /**
-        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
+//     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
-                .thenReturn(new ArrayList<>());
+//     */
-        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
+//    @Test
-        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(10);
+//    public void testGetListPage5() {
-        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(null);
+//        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
-        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn("");
+//                .thenReturn(new ArrayList<>());
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
+//        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(10);
-        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(null);
-        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn("");
-        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
-        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
+//        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageNum(10);
+//        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageSize(3);
+//        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
-        dataSourceConfigSearchParams.setUserId(1L);
+//        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
-        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
+//        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
-                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
+//        dataSourceConfigSearchParams.setPageNum(10);
-        assertEquals(0L, actualListPage.getEndRow());
+//        dataSourceConfigSearchParams.setPageSize(3);
-        assertTrue(actualListPage.isIsLastPage());
+//        dataSourceConfigSearchParams.setUserId(1L);
-        assertTrue(actualListPage.isIsFirstPage());
+//        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
-        assertFalse(actualListPage.isHasPreviousPage());
+//                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
-        assertFalse(actualListPage.isHasNextPage());
+//        assertEquals(0L, actualListPage.getEndRow());
-        assertEquals(0L, actualListPage.getTotal());
+//        assertTrue(actualListPage.isIsLastPage());
-        assertEquals(0L, actualListPage.getStartRow());
+//        assertTrue(actualListPage.isIsFirstPage());
-        assertEquals(0, actualListPage.getSize());
+//        assertFalse(actualListPage.isHasPreviousPage());
-        assertEquals(0, actualListPage.getPages());
+//        assertFalse(actualListPage.isHasNextPage());
-        assertEquals(0, actualListPage.getPageSize());
+//        assertEquals(0L, actualListPage.getTotal());
-        assertEquals(1, actualListPage.getPageNum());
+//        assertEquals(0L, actualListPage.getStartRow());
-        assertEquals(0, actualListPage.getNavigatepageNums().length);
+//        assertEquals(0, actualListPage.getSize());
-        assertEquals(8, actualListPage.getNavigatePages());
+//        assertEquals(0, actualListPage.getPages());
-        assertTrue(actualListPage.getList().isEmpty());
+//        assertEquals(0, actualListPage.getPageSize());
-        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
+//        assertEquals(1, actualListPage.getPageNum());
-        verify(dataSourceConfigSearchParams, atLeast(1)).getPageNum();
+//        assertEquals(0, actualListPage.getNavigatepageNums().length);
-        verify(dataSourceConfigSearchParams).getPageSize();
+//        assertEquals(8, actualListPage.getNavigatePages());
-        verify(dataSourceConfigSearchParams).getCompanyIds();
+//        assertTrue(actualListPage.getList().isEmpty());
-        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
+//        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
-        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).getPageNum();
-        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams).getPageSize();
-        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams).getCompanyIds();
-        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
-    }
+//        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-
+//        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-    /**
+//        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
-     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
+//        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
-     */
+//    }
-    @Test
+//
-    public void testGetListPage6() {
+//    /**
-        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
+//     * Method under test: {@link DataSourceConfigServiceImpl#getListPage(DataSourceConfigSearchParams, Long, Long, Integer)}
-                .thenReturn(new ArrayList<>());
+//     */
-        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
+//    @Test
-        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(null);
+//    public void testGetListPage6() {
-        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(3);
+//        when(dataSourceConfigMapperExt.getListPage(Mockito.<DataSourceConfigSearchParams>any()))
-        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn(null);
+//                .thenReturn(new ArrayList<>());
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
+//        DataSourceConfigSearchParams dataSourceConfigSearchParams = mock(DataSourceConfigSearchParams.class);
-        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        when(dataSourceConfigSearchParams.getPageNum()).thenReturn(null);
-        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getPageSize()).thenReturn(3);
-        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        when(dataSourceConfigSearchParams.getCompanyIds()).thenReturn(null);
-        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIdList(Mockito.<List<Long>>any());
-        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
+//        doNothing().when(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
+//        doNothing().when(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageNum(10);
+//        doNothing().when(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
-        dataSourceConfigSearchParams.setPageSize(3);
+//        doNothing().when(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
-        dataSourceConfigSearchParams.setUserId(1L);
+//        dataSourceConfigSearchParams.setCompanyIdList(new ArrayList<>());
-        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
+//        dataSourceConfigSearchParams.setCompanyIds("Company Ids");
-                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
+//        dataSourceConfigSearchParams.setPageNum(10);
-        assertEquals(0L, actualListPage.getEndRow());
+//        dataSourceConfigSearchParams.setPageSize(3);
-        assertTrue(actualListPage.isIsLastPage());
+//        dataSourceConfigSearchParams.setUserId(1L);
-        assertTrue(actualListPage.isIsFirstPage());
+//        PageInfo<DataSourceConfigVO> actualListPage = dataSourceConfigService
-        assertFalse(actualListPage.isHasPreviousPage());
+//                .getListPage(dataSourceConfigSearchParams, 1L, 1L, 1);
-        assertFalse(actualListPage.isHasNextPage());
+//        assertEquals(0L, actualListPage.getEndRow());
-        assertEquals(0L, actualListPage.getTotal());
+//        assertTrue(actualListPage.isIsLastPage());
-        assertEquals(0L, actualListPage.getStartRow());
+//        assertTrue(actualListPage.isIsFirstPage());
-        assertEquals(0, actualListPage.getSize());
+//        assertFalse(actualListPage.isHasPreviousPage());
-        assertEquals(0, actualListPage.getPages());
+//        assertFalse(actualListPage.isHasNextPage());
-        assertEquals(0, actualListPage.getPageSize());
+//        assertEquals(0L, actualListPage.getTotal());
-        assertEquals(1, actualListPage.getPageNum());
+//        assertEquals(0L, actualListPage.getStartRow());
-        assertEquals(0, actualListPage.getNavigatepageNums().length);
+//        assertEquals(0, actualListPage.getSize());
-        assertEquals(8, actualListPage.getNavigatePages());
+//        assertEquals(0, actualListPage.getPages());
-        assertTrue(actualListPage.getList().isEmpty());
+//        assertEquals(0, actualListPage.getPageSize());
-        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
+//        assertEquals(1, actualListPage.getPageNum());
-        verify(dataSourceConfigSearchParams).getPageNum();
+//        assertEquals(0, actualListPage.getNavigatepageNums().length);
-        verify(dataSourceConfigSearchParams, atLeast(1)).getPageSize();
+//        assertEquals(8, actualListPage.getNavigatePages());
-        verify(dataSourceConfigSearchParams).getCompanyIds();
+//        assertTrue(actualListPage.getList().isEmpty());
-        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
+//        verify(dataSourceConfigMapperExt).getListPage(Mockito.<DataSourceConfigSearchParams>any());
-        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
+//        verify(dataSourceConfigSearchParams).getPageNum();
-        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).getPageSize();
-        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams).getCompanyIds();
-        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//        verify(dataSourceConfigSearchParams, atLeast(1)).setCompanyIdList(Mockito.<List<Long>>any());
-    }
+//        verify(dataSourceConfigSearchParams).setCompanyIds(Mockito.<String>any());
-}
+//        verify(dataSourceConfigSearchParams).setPageNum(Mockito.<Integer>any());
-
+//        verify(dataSourceConfigSearchParams).setPageSize(Mockito.<Integer>any());
+//        verify(dataSourceConfigSearchParams).setUserId(Mockito.<Long>any());
+//    }
+//}
+//

pom.xml

@@ -132,7 +132,7 @@
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>5.8.2</version>
+<!--            <version>5.8.2</version>-->
             <scope>test</scope>
         </dependency>
         <dependency>