${bo}
@@ -54,7 +54,7 @@ #list>diff --git a/deliverables/k8s/fangjia-static.yaml b/deliverables/k8s/fangjia-static.yaml index da58e88a9..fa7f9b842 100644 --- a/deliverables/k8s/fangjia-static.yaml +++ b/deliverables/k8s/fangjia-static.yaml @@ -98,4 +98,4 @@ spec: ports: - port: 8080 targetPort: 8080 - nodePort: 30005 \ No newline at end of file + nodePort: 30013 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-manager.yaml b/deliverables/k8s/fangjia-youda-manager.yaml new file mode 100644 index 000000000..2fa388c75 --- /dev/null +++ b/deliverables/k8s/fangjia-youda-manager.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-manager + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-manager + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-manager + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-manager + image: 192.168.0.19:9012/fangjia-youda-manager:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-manager + namespace: fangjia + labels: + project: fangjia-youda-manager + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-manager + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30006 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-web-business.yaml b/deliverables/k8s/fangjia-youda-web-business.yaml new file mode 100644 index 000000000..ee19e4c63 --- /dev/null +++ b/deliverables/k8s/fangjia-youda-web-business.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-web-business + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-web-business + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-web-business + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-web-business + image: 192.168.0.19:9012/fangjia-youda-web-business:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-web-business + namespace: fangjia + labels: + project: fangjia-youda-web-business + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-web-business + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30012 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-web-customer.yaml b/deliverables/k8s/fangjia-youda-web-customer.yaml new file mode 100644 index 000000000..d8374216b --- /dev/null +++ b/deliverables/k8s/fangjia-youda-web-customer.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-web-customer + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-web-customer + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-web-customer + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-web-customer + image: 192.168.0.19:9012/fangjia-youda-web-customer:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-web-customer + namespace: fangjia + labels: + project: fangjia-youda-web-customer + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-web-customer + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30011 \ No newline at end of file diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java index c3a3756a9..cccf755b8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java @@ -188,6 +188,8 @@ public class TrendController { // avgPrice = model.getRegionStatBo().getAvgPrice(); // } + int count = districtService.findCityDistrictCount(city); + model.setCount(count); model.setTrendView(trendView); //model.setLastestHouse(getRelatedHouse(model.getRegion(), avgPrice)); return model; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java index 6e7cfda75..a06cb6a31 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java @@ -53,6 +53,7 @@ public class TrendModel extends BaseModel implements TrendViewModel { private int showBlock; // 小区走势图里显示板块线,不为0时显示 private String errMsg; //错误信息 private int code; //错误code 1成功 -1失败 + private int count; public String getKeyword() { return keyword; } @@ -317,4 +318,11 @@ public class TrendModel extends BaseModel implements TrendViewModel { this.code = code; } + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } } diff --git a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl index c4fb35940..ea155f653 100644 --- a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl +++ b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl @@ -125,6 +125,7 @@
${bo}
@@ -54,7 +54,7 @@ #list>