2 Commits d0861eac86 ... 4b4f17551e

Autor SHA1 Mensagem Data
  1 4b4f17551e Merge branch 'master' of http://gogs.imwork.top/Silos/imwork-plus 4 semanas atrás
  1 e80c9eca93 1.打包 4 semanas atrás

+ 1 - 1
imwork-assist/imwork-generator-service/src/main/java/top/imwork/assist/generator/service/IGeneratorService.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * Since<版本号>: 1.0.0
  */
 public interface IGeneratorService {
-    public ResponseMsg queryList(Map<String, Object> params);
+    public ResponseMsg list(Map<String, Object> params);
 
     public Map<String, String> queryTable(String tableName);
 }

+ 20 - 2
imwork-assist/imwork-generator-service/src/main/java/top/imwork/assist/generator/service/impl/GeneratorServiceImpl.java

@@ -1,13 +1,19 @@
 package top.imwork.assist.generator.service.impl;
 
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.mysql.cj.jdbc.MysqlDataSource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import top.imwork.assist.generator.dao.BaseMapper;
 import top.imwork.assist.generator.service.IGeneratorService;
 import top.imwork.commons.core.pojo.ResponseMsg;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,6 +28,9 @@ import java.util.Map;
  */
 @Service
 public class GeneratorServiceImpl implements IGeneratorService {
+    @Autowired
+    private BaseMapper baseMapper;
+
     private DataSource getDataSource(){
         MysqlDataSource dataSource = new MysqlDataSource();
         dataSource.setURL("jdbc:mysql://mysql.imwork.top:63306/imwork_silos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC");
@@ -35,9 +44,18 @@ public class GeneratorServiceImpl implements IGeneratorService {
         return connection;
     }
     @Override
-    public ResponseMsg queryList(Map<String, Object> params) {
+    public ResponseMsg list(Map<String, Object> params) {
+        Integer pages = Integer.parseInt(String.valueOf(params.get("page")));
+        Integer rows = Integer.parseInt(String.valueOf(params.get("limit")));
+
+        Page<?> page = PageHelper.startPage(pages, rows);
+        List<Map<String, Object>> list = baseMapper.queryList(params);
 
-        return null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", 0);
+        map.put("count", (int) page.getTotal());
+        map.put("data", list);
+        return ResponseMsg.ok(map);
     }
 
     @Override

+ 18 - 0
imwork-iaas/imwork-gateway-service/pom.xml

@@ -54,4 +54,22 @@
             <artifactId>spring-cloud-gateway-server</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>top.imwork.iaas.gateway.GatewayServiceStart</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

+ 16 - 0
imwork-windows/imwork-silos/pom.xml

@@ -73,5 +73,21 @@
                 </includes>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>top.imwork.window.silos.SilosStart</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>