修改数据库

pom.xml

@@ -2,6 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>com.yeejoin.amos</groupId>
     <artifactId>amos-api-tool</artifactId>
     <packaging>jar</packaging>
@@ -176,6 +177,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/yeejoin/amos/api/tool/controller/DatabaseConnectionResource.java

@@ -134,5 +134,4 @@ public class DatabaseConnectionResource {
     }
 
 
-
 }

src/main/java/com/yeejoin/amos/api/tool/controller/TemplateCategoryResource.java

@@ -95,6 +95,7 @@ public class TemplateCategoryResource {
     public ResponseModel<List<TemplateCategoryModel>> selectForList(){
         return ResponseHelper.buildResponse(templateCategoryService.queryForTplCateList());
     }
+
     /**
      * 列表树形结构查询
      * @return List<ApiSourceDto>

src/main/java/com/yeejoin/amos/api/tool/face/service/TemplateCategoryService.java

@@ -2,16 +2,20 @@ package com.yeejoin.amos.api.tool.face.service;
 
 import com.yeejoin.amos.api.tool.face.model.TemplateCategoryModel;
 import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
+import com.yeejoin.amos.api.tool.face.model.VisualDesignerModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.TemplateCategoryMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.TemplateCategory;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 
+import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.List;
-
+import java.util.Map;
 
 @Service
 public class TemplateCategoryService extends BaseService<TemplateCategoryModel, TemplateCategory, TemplateCategoryMapper> {
@@ -21,6 +25,12 @@ public class TemplateCategoryService extends BaseService<TemplateCategoryModel,
     @Autowired
     private TemplateService templateService;
 
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    @Qualifier("dataSource-amos-studio")
+    private DataSource dataSource;
+
     /**
      * 列表查询
      */
@@ -59,11 +69,16 @@ public class TemplateCategoryService extends BaseService<TemplateCategoryModel,
      */
     public List<TemplateCategoryTreeModel> getTree() {
         /**
-         * 此处需要改
+         * 修改后
          */
-        List<TemplateCategoryModel> templateCategoryModels = this.queryForTplCateList();
+        jdbcTemplate=new JdbcTemplate(dataSource);
+        List<TemplateCategoryModel> templateCategoryModels = jdbcTemplate.queryForList("select  * from studio_template_category", TemplateCategoryModel.class);
+        //      List<TemplateCategoryModel> templateCategoryModels = this.queryForTplCateList();
         List<TemplateCategoryTreeModel> nodes = this.tplCateToNode(templateCategoryModels);
-        nodes.addAll(visualDesignerService.VisualDesignerToNode(visualDesignerService.queryForVisualDesignerList()));
+
+        List<VisualDesignerModel> visualDesignerLists = jdbcTemplate.queryForList("select * from studio_visual_designer", VisualDesignerModel.class);
+//        List<VisualDesignerModel> visualDesignerLists = visualDesignerService.queryForVisualDesignerList();
+        nodes.addAll(visualDesignerService.VisualDesignerToNode(visualDesignerLists));
         return getChildren(nodes, "", 0L);
     }
 

src/main/java/com/yeejoin/amos/api/tool/face/service/TemplateService.java

@@ -12,11 +12,15 @@ import com.yeejoin.amos.api.tool.face.orm.entity.Template;
 import com.yeejoin.amos.api.tool.utils.ConvertUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.sql.DataSource;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -31,21 +35,52 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
     @Autowired
     private TemplateCategoryService templateCategoryService;
 
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    @Qualifier("dataSource-amos-studio")
+    private DataSource dataSource;
+
     /**
      * 分页查询
      */
     public Page<TemplateModel> queryForTplPage(Page<TemplateModel> page, Long categorySeq, String displayName) {
         List<TemplateCategoryTreeModel> modelList = templateCategoryService.getTree();
         List<TemplateModel> records = new ArrayList<>();
+        jdbcTemplate=new JdbcTemplate(dataSource);
         for (TemplateCategoryTreeModel visualDesigner : modelList) {
             if (Objects.equals(categorySeq, visualDesigner.getSequenceNbr())) {
                 for (TemplateCategoryTreeModel category : visualDesigner.getChildren()) {
-                    records.addAll(this.queryForTplListByCategorySeq(category.getSequenceNbr()));
+
+                    //studio_template
+                    Long para[]=new Long[]{category.getSequenceNbr()};
+                    List<TemplateModel> templateModels = jdbcTemplate.queryForList("select * from studio_template", para, TemplateModel.class);
+//                  List<TemplateModel> templateModels = this.queryForTplListByCategorySeq(category.getSequenceNbr());
+                    records.addAll(templateModels);
                 }
                 return this.queryForPages(records, page);
             }
         }
-        return this.queryForPage(page, null, false, categorySeq, displayName);
+        Long curr=page.getCurrent();
+        Long pageSize=page.getSize();
+        int offset = (curr.intValue() - 1) * pageSize.intValue();
+        // 构建 SQL 查询语句
+        String sql = "SELECT * FROM studio_template WHERE category_seq = ? AND display_name = ? LIMIT ? OFFSET ?";
+        // 构建参数数组
+        Object[] params = { categorySeq, displayName, pageSize, offset };
+        // 查询总记录数
+        String countSql = "SELECT COUNT(*) FROM studio_template WHERE category_seq = ? AND display_name = ?";
+        Long total = jdbcTemplate.queryForObject(countSql, Long.class, categorySeq, displayName);
+        // 查询分页数据
+        List<TemplateModel> data = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TemplateModel.class), params);
+        // 构建Page对象
+        Page<TemplateModel> pageResult = new Page<>();
+        pageResult.setCurrent(pageSize);
+        pageResult.setSize(pageSize);
+        pageResult.setTotal(total);
+        pageResult.setRecords(data);
+        return pageResult;
+//      return this.queryForPage(page, null, false, categorySeq, displayName);
     }
 
     public Page<TemplateModel> queryForPages(List<TemplateModel> records, Page<TemplateModel> page) {

src/main/resources/application-dev.properties

-#DB properties:
-# jdbc_config
 spring.datasource.jdbc-url=jdbc:mysql://172.16.3.18:3306/amos_tool_library?allowMultiQueries=true
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
@@ -13,8 +11,8 @@ spring.datasource.hikari.pool-name=DatebookHikariCP
 spring.datasource.hikari.max-lifetime=1800000
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
-# second-datasource amos_studio
-spring.second-datasource.jdbc-url=jdbc:mysql://172.16.3.18:3306/amos_studio?allowMultiQueries=true
+
+spring.second-datasource.jdbc-url=jdbc:mysql://172.16.3.18:3306/amos_studio_delete?allowMultiQueries=true
 spring.second-datasource.username=root
 spring.second-datasource.password=Yeejoin@2020
 spring.second-datasource.driver-class-name=com.mysql.cj.jdbc.Driver

src/main/resources/application.properties

 spring.application.name=AMOS-ATL
 server.servlet.context-path=/atl
 #server.servlet.context-path=/jcs
-server.port=6666
+server.port=30002
 #server.port=20000
 spring.profiles.active=dev
 #spring.profiles.active=qa
@@ -10,7 +10,7 @@ management.health.elasticsearch.enabled=false
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
-#mybatis-plus\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\uFFFDmybatis\uFFFD\u0123\uFFFD\uFFFD\uFFFD\uFFFD\u04B2\uFFFD\uFFFD\uFFFD
+#mybatis-plus\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD�\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\uFFFDmybatis\uFFFD\u0123\uFFFD\uFFFD\uFFFD\uFFFD\u04B2\uFFFD\uFFFD\uFFFD
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.configuration.map-underscore-to-camel-case=true