Procházet zdrojové kódy

Merge remote-tracking branch 'origin/develop' into develop

lvxianyun před 3 roky
rodič
revize
3013dec7f7

+ 8 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataController.java

@@ -59,7 +59,14 @@ public class DictDataController {
         }
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria, DictData.class);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        // 转换查询条件
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

+ 7 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataMapController.java

@@ -46,7 +46,13 @@ public class DictDataMapController {
         QueryWrapper<DictDataMap> wrapper = new QueryWrapper<>();
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria, DictDataMap.class);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

+ 7 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictTypeController.java

@@ -46,7 +46,13 @@ public class DictTypeController {
         QueryWrapper<DictType> wrapper = new QueryWrapper<>();
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria, DictType.class);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

+ 7 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/DictDataMapService.java

@@ -14,6 +14,13 @@ import java.util.List;
 public interface DictDataMapService {
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<DictDataMap> queryWrapper);
+
+    /**
      * 按条件查询
      * @param page 分页条件
      * @param queryWrapper 查询条件

+ 7 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/DictDataService.java

@@ -3,7 +3,6 @@ package com.persagy.dmp.dic.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.dic.entity.DictData;
-import com.persagy.dmp.dic.entity.DictData;
 import com.persagy.dmp.dic.entity.DictType;
 
 import java.util.List;
@@ -16,6 +15,13 @@ import java.util.List;
 public interface DictDataService {
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<DictData> queryWrapper);
+
+    /**
      * 按条件查询
      * @param page 分页条件
      * @param queryWrapper 查询条件

+ 8 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/DictTypeService.java

@@ -12,6 +12,14 @@ import java.util.List;
  * @date:2021/6/10
  */
 public interface DictTypeService {
+
+    /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<DictType> queryWrapper);
+
     /**
      * 按条件查询
      * @param page 分页条件

+ 10 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/impl/DictDataMapServiceImpl.java

@@ -24,6 +24,16 @@ public class DictDataMapServiceImpl implements DictDataMapService {
     private DictDataMapMapper dao;
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public Integer queryCount(Wrapper<DictDataMap> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    /**
      * 分页查询
      *
      * @param page         分页条件

+ 10 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/impl/DictDataServiceImpl.java

@@ -33,6 +33,16 @@ public class DictDataServiceImpl implements DictDataService {
     private DictDataMapService dictDataMapService;
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public Integer queryCount(Wrapper<DictData> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    /**
      * 分页查询
      *
      * @param page         分页条件

+ 10 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/impl/DictTypeServiceImpl.java

@@ -25,6 +25,16 @@ public class DictTypeServiceImpl implements DictTypeService {
     private DictTypeMapper dao;
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public Integer queryCount(Wrapper<DictType> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    /**
      * 分页查询
      * @param page 分页条件
      * @param queryWrapper 查询条件

+ 1 - 1
docker/dockerfiles/dmp-dic/entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "entrypoint run..."
-java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar
+java -jar $JAVA_OPTS -Dserver.port=$SERVER_PORT -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 1 - 1
docker/dockerfiles/dmp-rwd/entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "entrypoint run..."
-java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar
+java -jar $JAVA_OPTS -Dserver.port=$SERVER_PORT -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 77 - 0
docker/k8sfiles/dmp-dic-standard.yml

@@ -0,0 +1,77 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dmp-dic
+  labels:
+    app: dmp-dic
+spec:
+  selector:
+    app: dmp-dic
+  ports:
+  - port: 8080
+    targetPort: 8080
+    name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dmp-dic
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dmp-dic
+  template:
+    metadata:
+      labels:
+        app: dmp-dic
+    spec:
+      containers:
+      - name: dmp-dic
+        image: labisenlin.persagy.com/library/dmp-dic:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8080
+          name: server-port
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8080"
+        - name: SPRING_CLOUD_CONFIG_URI
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-dic
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-dic
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-dic
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-dic
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-dic
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-dic
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-dic
+              key: eureka.instance.ip.address

+ 77 - 0
docker/k8sfiles/dmp-rwd-standard.yml

@@ -0,0 +1,77 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dmp-rwd
+  labels:
+    app: dmp-rwd
+spec:
+  selector:
+    app: dmp-rwd
+  ports:
+  - port: 8080
+    targetPort: 8080
+    name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dmp-rwd
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dmp-rwd
+  template:
+    metadata:
+      labels:
+        app: dmp-rwd
+    spec:
+      containers:
+      - name: dmp-rwd
+        image: labisenlin.persagy.com/library/dmp-rwd:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8080
+          name: server-port
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8080"
+        - name: SPRING_CLOUD_CONFIG_URI
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-rwd
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-rwd
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-rwd
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-rwd
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-rwd
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-rwd
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-rwd
+              key: eureka.instance.ip.address