Skip to content

C
civil-bigdata
Commit dffdf42e by 袁伟铭
Options

修改

parent 337c9ee1
Showing with 337 additions and 65 deletions
common-utils/src/main/java/com/zq/common/entity/SystemArea.java
......@@ -95,8 +95,7 @@ public class SystemArea {
for (int i = subAreaCodeBuilder.length(); i < 12; i++) {
subAreaCodeBuilder.append("0");
}
subAreaCode = subAreaCodeBuilder.toString();
return subAreaCode;
return subAreaCodeBuilder.toString();
}
/**
......
config/nginx/nginx.conf
......@@ -7,18 +7,6 @@ server {
# Load configuration files for the default server block.
include /etc/nginx/default.d/*.conf;
# location / {
# root /opt/gxclweb/dist;
# index index.html;
# }
# location ~ -SERVER/ {
# proxy_pass http://127.0.0.1:9888;
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# }
location / {
root /opt/drugweb/dist;
index index.html;
......@@ -34,15 +22,6 @@ server {
autoindex on;
}
location /auth {
proxy_pass http://127.0.0.1:9888;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location /sys {
proxy_pass http://127.0.0.1:9888;
proxy_set_header X-Forwarded-Proto $scheme;
......@@ -61,25 +40,7 @@ server {
proxy_set_header Connection "upgrade";
}
location /bbs {
proxy_pass http://127.0.0.1:9888;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location /drug {
proxy_pass http://127.0.0.1:9888;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location /chat {
location /portal {
proxy_pass http://127.0.0.1:9888;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
......
config/sh/api/api.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------start--------"
PID=$(ps -ef|grep api-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/api/api-server-1.0.0.jar --server.port=9100 > api.log 2>&1 &
echo "--------------start success-----------"
exit
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/api/api-server-1.0.0.jar --server.port=9100 > api.log 2>&1 &
echo "--------------start success-----------"
exit
fi
config/sh/config/config.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------start--------"
PID=$(ps -ef|grep config-client-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/config/config-client-1.0.0.jar --server.port=8300 > config.log 2>&1 &
echo "--------------start success-----------"
exit
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/config/config-client-1.0.0.jar --server.port=8300 > config.log 2>&1 &
echo "--------------start success-----------"
exit
fi
config/sh/eureka/eureka.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------start--------"
PID=$(ps -ef|grep eureka-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/eureka/eureka-server-1.0.0.jar --server.port=8800 > eureka.log 2>&1 &
echo "--------------start success-----------"
exit
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/eureka/eureka-server-1.0.0.jar --server.port=8800 > eureka.log 2>&1 &
echo "--------------start success-----------"
exit
fi
config/sh/gateway/gateway.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------start--------"
PID=$(ps -ef|grep gateway-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/gateway/gateway-server-1.0.0.jar --server.port=9888 > gateway.log 2>&1 &
echo "--------------start success-----------"
exit
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/gateway/gateway-server-1.0.0.jar --server.port=9888 > gateway.log 2>&1 &
echo "--------------start success-----------"
exit
fi
config/sh/portal/portal.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------start--------"
PID=$(ps -ef|grep portal-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/portal/portal-server-1.0.0.jar --server.port=9700 > portal.log 2>&1 &
echo "--------------start success-----------"
exit
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/portal/portal-server-1.0.0.jar --server.port=9700 > portal.log 2>&1 &
echo "--------------start success-----------"
exit
fi
config/sh/start.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------eureka start--------"
cd /opt/wine/eureka
PID=$(ps -ef|grep eureka-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/eureka/eureka-server-1.0.0.jar --server.port=8800 > eureka.log 2>&1 &
echo "--------------start success-----------"
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/eureka/eureka-server-1.0.0.jar --server.port=8800 > eureka.log 2>&1 &
echo "--------------start success-----------"
fi
sleep 20s
cd /opt/wine/config
echo "--------config start--------"
PID=$(ps -ef|grep config-client-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/config/config-client-1.0.0.jar --server.port=8300 > config.log 2>&1 &
echo "--------------start success-----------"
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/config/config-client-1.0.0.jar --server.port=8300 > config.log 2>&1 &
echo "--------------start success-----------"
fi
sleep 30s
cd /opt/wine/gateway
echo "--------gateway start--------"
PID=$(ps -ef|grep gateway-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/gateway/gateway-server-1.0.0.jar --server.port=9888 > gateway.log 2>&1 &
echo "--------------start success-----------"
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/gateway/gateway-server-1.0.0.jar --server.port=9888 > gateway.log 2>&1 &
echo "--------------start success-----------"
fi
sleep 2s
cd /opt/wine/sys
echo "--------sys start--------"
PID=$(ps -ef|grep sys-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/sys/sys-server-1.0.0.jar --server.port=9000 > sys.log 2>&1 &
echo "--------------start success-----------"
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/sys/sys-server-1.0.0.jar --server.port=9000 > sys.log 2>&1 &
echo "--------------start success-----------"
fi
sleep 2s
cd /opt/wine/api
echo "--------api start--------"
PID=$(ps -ef|grep api-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/api/api-server-1.0.0.jar --server.port=9100 > api.log 2>&1 &
echo "--------------start success-----------"
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/api/api-server-1.0.0.jar --server.port=9100 > api.log 2>&1 &
echo "--------------start success-----------"
fi
sleep 2s
cd /opt/wine/user
echo "--------user start--------"
PID=$(ps -ef|grep user-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/user/user-server-1.0.0.jar --server.port=9800 > user.log 2>&1 &
echo "--------------start success-----------"
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/user/user-server-1.0.0.jar --server.port=9800 > user.log 2>&1 &
echo "--------------start success-----------"
fi
sleep 2s
cd /opt/wine/portal
echo "--------portal start--------"
PID=$(ps -ef|grep portal-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/portal/portal-server-1.0.0.jar --server.port=9700 > portal.log 2>&1 &
echo "--------------start success-----------"
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/portal/portal-server-1.0.0.jar --server.port=9700 > portal.log 2>&1 &
echo "--------------start success-----------"
fi
config/sh/sys/sys.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------start--------"
PID=$(ps -ef|grep sys-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/sys/sys-server-1.0.0.jar --server.port=9000 > sys.log 2>&1 &
echo "--------------start success-----------"
exit
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/sys/sys-server-1.0.0.jar --server.port=9000 > sys.log 2>&1 &
echo "--------------start success-----------"
exit
fi
config/sh/user/user.sh 0 → 100644
#!/bin/bash
JAVAHOME=$JAVA_HOME
echo "--------start--------"
PID=$(ps -ef|grep user-server-1.0.0.jar |grep -v grep|awk '{print $2}')
if [ ! $PID ]; then
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/user/user-server-1.0.0.jar --server.port=9800 > user.log 2>&1 &
echo "--------------start success-----------"
exit
else
kill -9 ${PID}
echo "--------------kill success-----------"
echo "---------------now wait start-------"
nohup java -jar -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -Xms512m -Xmn768m -Xmx1024m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC /opt/wine/user/user-server-1.0.0.jar --server.port=9800 > user.log 2>&1 &
echo "--------------start success-----------"
exit
fi
portal-server/src/main/java/com/zq/portal/config/SpringSecurityConfig.java
......@@ -78,7 +78,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
//不使用注解的时候在这添加url放行
apiSet.add("/static/map/**");
apiSet.add("/portal/app/**");
// apiSet.add("/**");
apiSet.add("/**");
anonymousUrls.put("API", apiSet);
httpSecurity
......
portal-server/src/main/java/com/zq/portal/controller/admin/CjStatsAdminController.java
package com.zq.portal.controller.admin;
import com.zq.common.utils.AssertUtils;
import com.zq.common.vo.ResultVo;
import com.zq.portal.service.CjStatsService;
import com.zq.portal.vo.StatsReqVo;
......@@ -29,7 +28,6 @@ public class CjStatsAdminController {
@ApiOperation("获取残疾等级统计")
@PostMapping(value = "/getDisabledLevelStats")
public ResultVo getDisabledLevelStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(cjStatsService.getCacheDisabledLevelStats(vo));
}
......
portal-server/src/main/java/com/zq/portal/controller/admin/EtStatsAdminController.java
package com.zq.portal.controller.admin;
import com.zq.common.entity.VChildWelfareStats;
import com.zq.common.vo.ResultVo;
import com.zq.portal.service.EtStatsService;
import com.zq.portal.vo.StatsReqVo;
......@@ -12,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(tags = "儿童统计相关接口")
@RequiredArgsConstructor
@RestController
......@@ -30,7 +27,7 @@ public class EtStatsAdminController {
@ApiOperation("统计该区域的机构和儿童数量统计列表")
@PostMapping(value = "/getAgencyChildStatsList")
public ResultVo<List<VChildWelfareStats>> getAgencyChildStatsList(@RequestBody StatsReqVo vo) {
public ResultVo getAgencyChildStatsList(@RequestBody StatsReqVo vo) {
return ResultVo.success(etStatsService.getCacheAgencyChildStatsList(vo));
}
......
portal-server/src/main/java/com/zq/portal/controller/admin/YlStatsAdminController.java 0 → 100644
package com.zq.portal.controller.admin;
import com.zq.common.vo.ResultVo;
import com.zq.portal.service.YlStatsService;
import com.zq.portal.vo.StatsReqVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "养老统计相关接口")
@RequiredArgsConstructor
@RestController
@RequestMapping(value = "/portal/admin/stats")
public class YlStatsAdminController {
public final YlStatsService ylStatsService;
@ApiOperation("获取区域养老院统计列表")
@PostMapping(value = "/getAreaNursingStatsList")
public ResultVo getAreaNursingStatsList(@RequestBody StatsReqVo vo) {
return ResultVo.success(ylStatsService.getCacheAreaNursingStatsList(vo));
}
}
portal-server/src/main/java/com/zq/portal/controller/app/EtStatsController.java
package com.zq.portal.controller.app;
import com.zq.common.entity.VChildWelfareStats;
import com.zq.common.vo.ResultVo;
import com.zq.portal.service.EtStatsService;
import com.zq.portal.vo.StatsReqVo;
......@@ -12,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(tags = "儿童统计相关接口")
@RequiredArgsConstructor
@RestController
......@@ -24,7 +21,7 @@ public class EtStatsController {
@ApiOperation("儿童福利机构统计列表")
@PostMapping(value = "/getAgencyChildStatsList")
public ResultVo<List<VChildWelfareStats>> getAgencyChildStatsList(@RequestBody StatsReqVo vo) {
public ResultVo getAgencyChildStatsList(@RequestBody StatsReqVo vo) {
return ResultVo.success(etStatsService.getCacheAgencyChildStatsList(vo));
}
......
portal-server/src/main/java/com/zq/portal/service/CjStatsService.java
package com.zq.portal.service;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.zq.common.config.redis.RedisUtils;
import com.zq.common.entity.SystemArea;
......@@ -52,10 +51,13 @@ public class CjStatsService {
List<Map<String, Object>> returnData = new ArrayList<>();
List<StatsVo> disabledLevelStats = cjStatsDao.getDisabledLevelStats(vo);
for (StatsVo disabledLevelStat : disabledLevelStats) {
for (StatsVo statsVo : disabledLevelStats) {
if (!"1".equals(statsVo.getType()) && !"2".equals(statsVo.getType()) && !"3".equals(statsVo.getType()) && !"4".equals(statsVo.getType())) {
continue;
}
Map<String, Object> data = new HashMap<>();
data.put("level", disabledLevelStat.getType() + "级残疾");
data.put("num", "总数" + disabledLevelStat.getNum());
data.put("level", statsVo.getType() + "级残疾");
data.put("num", "总数" + statsVo.getNum());
returnData.add(data);
}
......
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
package com.zq.portal.service;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zq.common.config.redis.RedisUtils;
......@@ -80,10 +81,10 @@ public class EtStatsService {
return build;
}
public List<VChildWelfareStats> getCacheAgencyChildStatsList(StatsReqVo vo) {
public Object getCacheAgencyChildStatsList(StatsReqVo vo) {
Object obj = redisUtils.getObj(PortalCacheKeys.getAgencyChildStatsListKey(vo));
if (obj != null) {
return (List<VChildWelfareStats>) obj;
return obj;
}
return getAgencyChildStatsList(vo);
}
......@@ -94,7 +95,7 @@ public class EtStatsService {
* @param vo
* @return
*/
public List<VChildWelfareStats> getAgencyChildStatsList(StatsReqVo vo) {
public Map<String, Object> getAgencyChildStatsList(StatsReqVo vo) {
String cacheKey = PortalCacheKeys.getAgencyChildStatsListKey(vo);
if (StrUtil.isBlank(vo.getAreaCode())) {
vo.setAreaCode("450000000000");
......@@ -109,9 +110,27 @@ public class EtStatsService {
returnData.add(etAgencyWelfareStats);
}
redisUtils.setObj(cacheKey, returnData);
List<String> areaList = new ArrayList<>();
List<String> agencyNumList = new ArrayList<>();
List<String> orphanNumList = new ArrayList<>();
List<String> factUnadoptedNumList = new ArrayList<>();
for (VChildWelfareStats returnDatum : returnData) {
areaList.add(returnDatum.getAreaName());
agencyNumList.add(NumberUtil.toStr(returnDatum.getAgencyNum(), "0"));
orphanNumList.add(NumberUtil.toStr(returnDatum.getOrphanNum(), "0"));
factUnadoptedNumList.add(NumberUtil.toStr(returnDatum.getFactUnadoptedNum(), "0"));
}
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("areaList", areaList);
returnMap.put("agencyNumList", agencyNumList);
returnMap.put("orphanNumList", orphanNumList);
returnMap.put("factUnadoptedNumList", factUnadoptedNumList);
returnMap.put("areaStatsList", returnData);
return returnData;
redisUtils.setObj(cacheKey, returnMap);
return returnMap;
}
/**
......@@ -121,7 +140,7 @@ public class EtStatsService {
* @return
*/
public Object getCacheAgencyPercentageStats(StatsReqVo vo) {
Object obj = redisUtils.getObj(PortalCacheKeys.getAgencyChildStatsListKey(vo));
Object obj = redisUtils.getObj(PortalCacheKeys.getAgencyPercentageStatsKey(vo));
if (obj != null) {
return obj;
}
......@@ -135,10 +154,12 @@ public class EtStatsService {
* @return
*/
public Object getAgencyPercentageStats(StatsReqVo vo) {
List<VChildWelfareStats> agencyChildStatsList = getAgencyChildStatsList(vo);
Map<String, Object> statsMap = getAgencyChildStatsList(vo);
List<VChildWelfareStats> areaStatsList = (List<VChildWelfareStats>) statsMap.get("areaStatsList");
List<Map<String, Object>> returnData = new ArrayList<>();
for (VChildWelfareStats childWelfareStats : agencyChildStatsList) {
for (VChildWelfareStats childWelfareStats : areaStatsList) {
Map<String, Object> data = new HashMap<>();
data.put("name", childWelfareStats.getAreaName());
data.put("value", childWelfareStats.getAgencyNum());
......
portal-server/src/main/java/com/zq/portal/vo/StatsReqVo.java
......@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class StatsReqVo {
@Builder.Default
private String areaCode = "450000000000";
private String subAreaCode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment