Merge remote-tracking branch 'origin/master'

# Conflicts:
#	sys-server/src/main/java/com/zq/system/config/security/TokenProvider.java

api-server/src/main/java/com/zq/api/feign/PortalFeign.java

@@ -62,6 +62,9 @@ public interface PortalFeign {
     @PostMapping("/stats/getCremationStatsList")
     ResultVo getCremationStatsList(@RequestBody Map<String, Object> paramsMap);
 
+    @PostMapping("/stats/getCremationStatsById")
+    ResultVo getCremationStatsById(@RequestBody Map<String, Object> paramsMap);
+
     @PostMapping("/stats/getAreaUnderNumStats")
     ResultVo getAreaUnderNumStats(@RequestBody Map<String, Object> paramsMap);
 }

api-server/src/main/java/com/zq/api/feign/SysFeign.java

@@ -35,10 +35,10 @@ public interface SysFeign {
     @GetMapping(value = "/api/getApiUserByAppId")
     ResultVo getApiUserByAppId(@RequestParam String appId, @RequestParam String appSecret);
 
-    @GetMapping(value = "/single/getUserInfo/{appId}")
-    ResultVo getSingleUserInfo(@PathVariable String appId);
+    @GetMapping(value = "/sso/getUserInfo/{appId}")
+    ResultVo getSsoUserInfo(@PathVariable String appId);
 
-    @GetMapping(value = "/single/logout")
-    ResultVo singleLogout();
+    @GetMapping(value = "/sso/logout")
+    ResultVo ssoLogout();
 
 }

api-server/src/main/java/com/zq/api/service/ApiService.java

@@ -97,7 +97,7 @@ public class ApiService {
         }
 
         // 认证签名
-        String key = redisUtils.getStr(token);
+        String key = redisUtils.getStr("civil.apiKey." + token);
         String sign = ApiUtils.getSign(form.getSignStr(key == null ? "" : key));
         if (!sign.equals(form.getSign())) {
             return ApiUtils.getCheckSignValidError(form);

api-server/src/main/java/com/zq/api/service/IApiLogic.java

@@ -211,6 +211,14 @@ public interface IApiLogic extends IApiCommon {
      */
     ApiResp getCremationStatsList(ApiForm form);
 
+    /**
+     * 殡仪馆火化量统计列表
+     *
+     * @param form
+     * @return
+     */
+    ApiResp getCremationStatsById(ApiForm form);
+
     /*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓SYS接口↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
 
     /**
@@ -219,7 +227,7 @@ public interface IApiLogic extends IApiCommon {
      * @param form
      * @return
      */
-    ApiResp getSingleUserInfo(ApiForm form);
+    ApiResp getSsoUserInfo(ApiForm form);
 
     /**
      * 单点登出
@@ -227,7 +235,7 @@ public interface IApiLogic extends IApiCommon {
      * @param form
      * @return
      */
-    ApiResp singleLogout(ApiForm form);
+    ApiResp ssoLogout(ApiForm form);
 
     /*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓开放接口↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
 

api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java

@@ -151,13 +151,18 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
     }
 
     @Override
-    public ApiResp getSingleUserInfo(ApiForm form) {
-        return ApiUtils.toApiResp(form, sysFeign.getSingleUserInfo(form.getAppId()));
+    public ApiResp getCremationStatsById(ApiForm form) {
+        return ApiUtils.toApiResp(form, portalFeign.getCremationStatsById(form.getParamsMap()));
     }
 
     @Override
-    public ApiResp singleLogout(ApiForm form) {
-        return ApiUtils.toApiResp(form, sysFeign.singleLogout());
+    public ApiResp getSsoUserInfo(ApiForm form) {
+        return ApiUtils.toApiResp(form, sysFeign.getSsoUserInfo(form.getAppId()));
+    }
+
+    @Override
+    public ApiResp ssoLogout(ApiForm form) {
+        return ApiUtils.toApiResp(form, sysFeign.ssoLogout());
     }
 
     @Override

config-server/src/main/resources/properties/config-dev.yml

@@ -28,9 +28,9 @@ sync.name: SYNC-SERVER
 gateway.port: 9888
 gateway.name: GATEWAY-SERVER
 
-redis.url: 127.0.0.1
+redis.url: 106.52.179.107
 redis.port: 6379
-redis.password:
+redis.password: zq4208!@#$
 
 #数据库源配置
 jdbc.driver-class-name: com.mysql.cj.jdbc.Driver

config/sh/config/config.sh

@@ -9,14 +9,14 @@ 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 config-server-1.0.0.jar --spring.profiles.active=product --server.port=8500 > config.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC config-server-1.0.0.jar --server.port=8500 > 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 config-server-1.0.0.jar --spring.profiles.active=product --server.port=8500 > config.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC config-server-1.0.0.jar --server.port=8500 > config.log 2>&1 &
     echo "--------------start success-----------"
     exit
 fi

config/sh/eureka/eureka.sh

@@ -9,14 +9,14 @@ 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 eureka-server-1.0.0.jar --spring.profiles.active=product --server.port=8800 > eureka.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC 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 eureka-server-1.0.0.jar --spring.profiles.active=product --server.port=8800 > eureka.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC eureka-server-1.0.0.jar --server.port=8800 > eureka.log 2>&1 &
     echo "--------------start success-----------"
     exit
 fi

config/sh/start.sh

@@ -7,13 +7,13 @@ echo "--------eureka start--------"
 cd /home/civil/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 eureka-server-1.0.0.jar --spring.profiles.active=product --server.port=8800 > eureka.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC 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 eureka-server-1.0.0.jar --spring.profiles.active=product --server.port=8800 > eureka.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC eureka-server-1.0.0.jar --server.port=8800 > eureka.log 2>&1 &
     echo "--------------start success-----------"
 fi
 
@@ -23,13 +23,13 @@ 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 config-server-1.0.0.jar --spring.profiles.active=product --server.port=8500 > config.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC config-server-1.0.0.jar --server.port=8500 > 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 config-server-1.0.0.jar --spring.profiles.active=product --server.port=8500 > config.log 2>&1 &
+    nohup java -jar -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms256m -Xmn384m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC config-server-1.0.0.jar --server.port=8500 > config.log 2>&1 &
     echo "--------------start success-----------"
 fi
 

oauth-server/src/main/resources/application.yml

@@ -23,6 +23,14 @@ spring:
     #连接超时时间
     timeout: 5000
   datasource:
+    druid:
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
     dynamic: # mybatis plus多数据源插件
       primary: master #设置默认的数据源或者数据源组,默认值即为master
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
@@ -35,11 +43,11 @@ spring:
           driver-class-name: ${jdbc.driver-class-name}
       druid:
         # 初始连接数
-        initial-size: 10
+        initial-size: 5
         # 最小连接数
-        min-idle: 20
+        min-idle: 10
         # 最大连接数
-        max-active: 50
+        max-active: 20
         # 获取连接超时时间
         max-wait: 5000
         # 连接有效性检测时间

open-server/src/main/java/com/zq/open/config/RestTemplateConfigurer.java

-package com.zq.open.config;
-
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-
-@Configuration
-public class RestTemplateConfigurer {
-
-    @Bean
-    public RestTemplate restTemplate(RestTemplateBuilder builder) {
-        return builder.build();
-    }
-}

open-server/src/main/resources/application.yml

@@ -23,6 +23,14 @@ spring:
     #连接超时时间
     timeout: 5000
   datasource:
+    druid:
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
     dynamic: # mybatis plus多数据源插件
       primary: master #设置默认的数据源或者数据源组,默认值即为master
       strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
@@ -41,11 +49,11 @@ spring:
           url: ${ojdbc.mzzt.url}
       druid:
         # 初始连接数
-        initial-size: 10
+        initial-size: 5
         # 最小连接数
-        min-idle: 20
+        min-idle: 10
         # 最大连接数
-        max-active: 50
+        max-active: 20
         # 获取连接超时时间
         max-wait: 5000
         # 连接有效性检测时间

portal-server/src/main/java/com/zq/portal/controller/admin/BzStatsAdminController.java

@@ -35,6 +35,12 @@ public class BzStatsAdminController {
         return ResultVo.success(bzStatsService.getCacheCremationStatsList(vo));
     }
 
+    @ApiOperation("获取子级殡葬火化分析列表")
+    @PostMapping(value = "/getCremationStatsById")
+    public ResultVo<Object> getCremationStatsById(@RequestBody StatsReqVo vo) {
+        return ResultVo.success(bzStatsService.getCacheCremationStatsById(vo));
+    }
+
     @ApiOperation("获取区域火化率占比")
     @PostMapping(value = "/getCremationRateStats")
     public ResultVo<Object> getCremationRateStats(@RequestBody StatsReqVo vo) {

portal-server/src/main/java/com/zq/portal/controller/app/BzStatsController.java

@@ -25,12 +25,18 @@ public class BzStatsController {
         return ResultVo.success(bzStatsService.getCacheCremationStats(vo));
     }
 
-    @ApiOperation("获取区域殡葬火化分析列表")
+    @ApiOperation("获取父级殡葬火化分析列表")
     @PostMapping(value = "/getCremationStatsList")
     public ResultVo<Object> getCremationStatsList(@RequestBody StatsReqVo vo) {
         return ResultVo.success(bzStatsService.getCacheCremationStatsList(vo));
     }
 
+    @ApiOperation("获取子级殡葬火化分析列表")
+    @PostMapping(value = "/getCremationStatsById")
+    public ResultVo<Object> getCremationStatsById(@RequestBody StatsReqVo vo) {
+        return ResultVo.success(bzStatsService.getCacheCremationStatsById(vo));
+    }
+
     @ApiOperation("获取区域火化率占比")
     @PostMapping(value = "/getCremationRateStats")
     public ResultVo<Object> getCremationRateStats(@RequestBody StatsReqVo vo) {

portal-server/src/main/java/com/zq/portal/dao/BzStatsDao.java

@@ -45,4 +45,6 @@ public interface BzStatsDao {
      * @return
      */
     List<Map<String, Object>> search(SearchReqVo vo);
+
+    List<StatsVo> getCremationStats(StatsReqVo vo);
 }

portal-server/src/main/java/com/zq/portal/dao/CjStatsDao.java

@@ -39,7 +39,7 @@ public interface CjStatsDao {
     List<StatsVo> getYearSevereDisabledStats(StatsReqVo vo);
 
     /**
-     * 获取区域下的残疾人统计
+     * 获取区域下的重度残疾人统计
      *
      * @param vo
      * @return
@@ -47,6 +47,14 @@ public interface CjStatsDao {
     StatsVo getSeverePeopleNumStats(StatsReqVo vo);
 
     /**
+     * 获取区域下的困难残疾人统计
+     *
+     * @param vo
+     * @return
+     */
+    StatsVo getDifficultPeopleNumStats(StatsReqVo vo);
+
+    /**
      * 获取区域发放统计
      *
      * @return

portal-server/src/main/java/com/zq/portal/manager/PortalCacheKeys.java

@@ -86,6 +86,11 @@ public abstract class PortalCacheKeys {
         return PREFIX + "getCremationStatsList." + vo.getAreaCode() + "." + vo.getYear();
     }
 
+    //殡葬火化量殡仪馆数据统计
+    public static String getCremationStatsByIdKey(StatsReqVo vo) {
+        return PREFIX + "getCremationStatsById." + vo.getAreaCode() + "." + vo.getYear();
+    }
+
     // 区域火化率占比
     public static String getCremationRateStatsKey(StatsReqVo vo) {
         return PREFIX + "getCremationRateStats." + vo.getAreaCode() + "." + vo.getYear();

portal-server/src/main/java/com/zq/portal/service/BzStatsService.java

@@ -122,6 +122,23 @@ public class BzStatsService {
         return returnMap;
     }
 
+    public Object getCacheCremationStatsById(StatsReqVo vo) {
+        Object obj = redisUtils.getObj(PortalCacheKeys.getCremationStatsByIdKey(vo));
+        if (obj != null) {
+            return obj;
+        }
+        return getCremationStatsById(vo);
+    }
+
+    public List<StatsVo> getCremationStatsById(StatsReqVo vo) {
+        SystemArea systemArea = areaDao.selectById(vo.getAreaCode());
+        vo.setSubAreaCode(systemArea.subAreaCode());
+        vo.setSize(SystemArea.getNextLevelLength(systemArea.getType()));
+
+        List<StatsVo> statsList = bzStatsDao.getCremationStats(vo);
+        redisUtils.setObj(PortalCacheKeys.getCremationStatsByIdKey(vo), statsList);
+        return statsList;
+    }
     /**
      * 统计火化率占比
      *

portal-server/src/main/java/com/zq/portal/service/CjStatsService.java

@@ -236,6 +236,7 @@ public class CjStatsService {
             data.put("areaName", area.getName());
             data.put("areaCode",severeAreaIssueStat.getCode());
             data.put("severePeopleNum", cjStatsDao.getSeverePeopleNumStats(vo).getNum());
+            data.put("difficultPeopleNum",cjStatsDao.getDifficultPeopleNumStats(vo).getNum());
             data.put("issueNum", severeAreaIssueStat.getNum());
             data.put("issueAmount", severeAreaIssueStat.getAmount());
             areaPeopleNumList.add(data);

portal-server/src/main/java/com/zq/portal/service/EtStatsService.java

@@ -111,7 +111,9 @@ public class EtStatsService {
             vo.setAreaCode(systemArea.getCode());
             VChildWelfareStats etAgencyWelfareStats = getAgencyChildStats(vo);
 
-            returnData.add(etAgencyWelfareStats);
+            if (etAgencyWelfareStats != null) {
+                returnData.add(etAgencyWelfareStats);
+            }
         }
 
         List<String> areaList = new ArrayList<>();

portal-server/src/main/resources/application.yml

@@ -25,6 +25,14 @@ spring:
     #连接超时时间
     timeout: 5000
   datasource:
+    druid:
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
     dynamic: # mybatis plus多数据源插件
       primary: master #设置默认的数据源或者数据源组,默认值即为master
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
@@ -85,11 +93,11 @@ spring:
           url: ${jdbc.gxshjz.url}
       druid:
         # 初始连接数
-        initial-size: 10
+        initial-size: 5
         # 最小连接数
-        min-idle: 20
+        min-idle: 10
         # 最大连接数
-        max-active: 50
+        max-active: 20
         # 获取连接超时时间
         max-wait: 5000
         # 连接有效性检测时间

portal-server/src/main/resources/mapper/BzStatsMapper.xml

@@ -4,18 +4,34 @@
 
     <select id="getAreaCremationStats" resultType="com.zq.portal.vo.StatsVo">
         SELECT
-        LEFT(d.id, #{size}) 'code',
+        LEFT( b.beloing_cant_code, #{size}) 'code',
+        count(*) 'num'
+        FROM
+        fis_cremation_info_sum a
+        LEFT JOIN fis_organ b ON b.organ_name = a.create_organ_name
+        WHERE 1 = 1
+        <if test = "subAreaCode != null and subAreaCode != ''" >
+            AND b.beloing_cant_code LIKE CONCAT (#{subAreaCode},'%')
+        </if >
+        GROUP BY
+        LEFT (b.beloing_cant_code,#{size})
+    </select>
+
+    <select id="getCremationStats" resultType="com.zq.portal.vo.StatsVo">
+        SELECT
+        LEFT(b.beloing_cant_code,#{size}) 'code',
+        a.create_organ_name 'name',
         COUNT( 1 ) 'num'
         FROM
-        dic_city d
-        LEFT JOIN fis_cremation_info_sum f ON d.P_ID = f.POPULACE
-        WHERE 1=1
-        <if test="subAreaCode != null and subAreaCode != ''">
-            ANd d.id LIKE CONCAT (#{subAreaCode},'%')
-        </if>
-        AND
-        LEFT(f.CREMATION_TIME, 4) >= '2017'
-        GROUP BY LEFT(d.id, #{size})
+        fis_cremation_info_sum a
+        LEFT JOIN fis_organ b ON b.organ_name = a.create_organ_name
+        WHERE 1 = 1
+        <if test = "subAreaCode != null and subAreaCode != ''" >
+            AND b.beloing_cant_code LIKE CONCAT (#{subAreaCode},'%')
+        </if >
+        GROUP BY
+        a.create_organ_name,
+        LEFT (b.beloing_cant_code,#{size})
     </select>
     <select id="getCremationRateStats" resultType="com.zq.portal.vo.StatsVo">
         SELECT ROUND(hhsum.c1 / rksum.c2 * 100) 'num'

portal-server/src/main/resources/mapper/CjStatsMapper.xml

@@ -65,6 +65,22 @@
         </if>
     </select>
 
+    <select id="getDifficultPeopleNumStats" resultType="com.zq.portal.vo.StatsVo">
+        SELECT
+        COUNT( 1 ) 'num'
+        FROM
+        `cjrjz_proposer`
+        WHERE
+        ENSURE_LEVEL_ID IS NOT NULL
+        AND ENSURE_LEVEL_ID IN (3,4)
+        <if test="subAreaCode != null and subAreaCode != ''">
+            AND CARD_CODE LIKE CONCAT(#{subAreaCode}, '%')
+        </if>
+        <if test="year != null">
+            AND LEFT(CREATE_DATE, 4) = #{year}
+        </if>
+    </select>
+
     <select id="getAreaIssueStats" resultType="com.zq.portal.vo.StatsVo">
         SELECT LEFT(UNIT_ID, #{size}) 'code', APPLY_TYPE_ID 'type', GRANT_YEAR 'year', COUNT_PEOPLE 'num', SUM_MONEY
         'amount'

portal-server/src/main/resources/mapper/ShzzStatsMapper.xml

@@ -11,8 +11,8 @@
         <if test="subAreaCode != null and subAreaCode != ''">
             AND p.DEPTCODE LIKE CONCAT(#{subAreaCode},'%')
         </if>
-        <if test="year != null">
-            AND DATE_FORMAT(s.issueTime, "%Y") = #{year}
+        <if test="type != null">
+            AND s.ORGTYPE = #{type}
         </if>
     </select>
 
@@ -22,13 +22,10 @@
         s.orgType 'type'
         FROM
         soorgan s LEFT JOIN pfdept P ON s.DEPTID = p.DEPTID
-        WHERE LEFT ( p.DEPTCODE, 4 ) != '4500'
+        WHERE 1=1
         <if test="subAreaCode != null and subAreaCode != ''">
             AND p.DEPTCODE LIKE CONCAT(#{subAreaCode},'%')
         </if>
-        <if test="year != null">
-            AND DATE_FORMAT(s.issueTime, "%Y") = #{year}
-        </if>
         GROUP BY s.orgType
     </select>
 

resource-server/src/main/java/com/zq/resource/controller/DeptDutyController.java

@@ -127,7 +127,7 @@ public class DeptDutyController {
         return ResultVo.success();
     }
 
-    @ApiOperation("获取机构职责列表")
+    @ApiOperation("获取职责办事项列表")
     @PostMapping(value = "/getDeptLiabilityList")
     public ResultVo<PageVo<DeptLiability>> getDeptLiabilityList(@RequestBody KeywordFindVo vo) {
         return ResultVo.success(deptDutyService.getDeptLiabilityList(vo));
@@ -220,6 +220,15 @@ public class DeptDutyController {
         return ResultVo.success();
     }
 
+    @ApiOperation("删除事项-资源目录表")
+    @DeleteMapping(value = "/deleteDeptLiabilityCategory/{id}")
+    public ResultVo deleteDeptLiabilityCategory(@PathVariable String id) {
+        AssertUtils.hasText(id, "ID不能为空");
+
+        deptDutyService.deleteDeptLiabilityCategory(id);
+        return ResultVo.success();
+    }
+
     @ApiOperation("获取事项-资源目录表列表")
     @PostMapping(value = "/getDeptLiabilityCategoryList")
     public ResultVo<PageVo<DeptLiabilityCategoryVo>> getDeptLiabilityCategoryList(@RequestBody DeptLiabilityCategoryFindVo vo) {

resource-server/src/main/java/com/zq/resource/service/DeptDutyService.java

@@ -3,6 +3,7 @@ package com.zq.resource.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.utils.AssertUtils;
@@ -21,10 +22,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +38,7 @@ public class DeptDutyService {
     private final DeptLiabilityCategoryDao deptLiabilityCategoryDao;
     private final DeptLiabilityLabelDao deptLiabilityLabelDao;
     private final OrgDeptDao orgDeptDao;
+    private final DataCategoryDao dataCategoryDao;
 
     public PageVo<DeptDuty> getDeptDutyList(DeptDutyFindVo vo) {
         LambdaQueryWrapper<DeptDuty> lambdaQuery = Wrappers.lambdaQuery(DeptDuty.class);
@@ -153,6 +152,11 @@ public class DeptDutyService {
     }
 
     public void addDeptLiabilityCategory(DeptLiabilityCategory vo) {
+        DataCategory dataCategory = dataCategoryDao.selectById(vo.getCategoryId());
+        AssertUtils.notNull(dataCategory, "目录不存在");
+        DeptLiability deptLiability = deptLiabilityDao.selectById(vo.getDeptLiabilityId());
+        AssertUtils.notNull(deptLiability, "办事项不存在");
+
         vo.setCreateTime(DateUtil.date());
         vo.setUpdateTime(DateUtil.date());
 
@@ -171,11 +175,47 @@ public class DeptDutyService {
     }
 
     public PageVo<DeptLiabilityCategoryVo> getDeptLiabilityCategoryList(DeptLiabilityCategoryFindVo vo) {
-        return PagingUtils.paging(vo, deptLiabilityCategoryDao::getDeptLiabilityCategoryList);
+        LambdaQueryWrapper<DeptLiabilityCategory> lambdaQuery = Wrappers.lambdaQuery(DeptLiabilityCategory.class);
+        lambdaQuery.orderByDesc(DeptLiabilityCategory::getCreateTime);
+
+        List<DeptLiabilityCategoryVo> list = new ArrayList<>();
+        PageVo<DeptLiabilityCategory> paging = PagingUtils.paging(vo, deptLiabilityCategoryDao, DeptLiabilityCategory.class, lambdaQuery);
+        for (DeptLiabilityCategory row : paging.getRows()) {
+            DataCategory dataCategory = dataCategoryDao.selectById(row.getCategoryId());
+            DeptLiability deptLiability = deptLiabilityDao.selectById(row.getDeptLiabilityId());
+
+            DeptLiabilityCategoryVo build = DeptLiabilityCategoryVo.builder()
+                    .id(row.getId())
+                    .categoryId(dataCategory.getId())
+                    .deptLiabilityId(deptLiability.getId())
+                    .categoryName(dataCategory.getCataTitle())
+                    .deptLiabilityName(deptLiability.getBusinessName())
+                    .createTime(row.getCreateTime())
+                    .updateTime(row.getUpdateTime())
+                    .build();
+            list.add(build);
+        }
+
+        return PageVo.ofReqVo(vo, list, paging.getTotal());
     }
 
     public DeptLiabilityCategoryVo getDeptLiabilityCategoryInfo(String liabilityCategoryId) {
-        return deptLiabilityCategoryDao.getDeptLiabilityCategoryById(liabilityCategoryId);
+        DeptLiabilityCategory deptLiabilityCategory = deptLiabilityCategoryDao.selectById(liabilityCategoryId);
+        AssertUtils.notNull(deptLiabilityCategory, "办事项目录不存在");
+
+        DataCategory dataCategory = dataCategoryDao.selectById(deptLiabilityCategory.getCategoryId());
+        DeptLiability deptLiability = deptLiabilityDao.selectById(deptLiabilityCategory.getDeptLiabilityId());
+
+        DeptLiabilityCategoryVo build = DeptLiabilityCategoryVo.builder()
+                .id(deptLiabilityCategory.getId())
+                .categoryId(dataCategory.getId())
+                .deptLiabilityId(deptLiability.getId())
+                .categoryName(dataCategory.getCataTitle())
+                .deptLiabilityName(deptLiability.getBusinessName())
+                .createTime(deptLiabilityCategory.getCreateTime())
+                .updateTime(deptLiabilityCategory.getUpdateTime())
+                .build();
+        return build;
     }
 
     public void addDeptLiabilityLabel(DeptLiabilityLabel vo) {
@@ -261,7 +301,18 @@ public class DeptDutyService {
                 String label = deptLiabilityLabelList.stream().map(DeptLiabilityLabel::getLabel).collect(Collectors.joining(";"));
                 params.put("label", label);
 
-                params.put("cataId", "");
+                List<DeptLiabilityCategory> liabilityCategoryList = deptLiabilityCategoryDao.selectList(Wrappers.lambdaQuery(DeptLiabilityCategory.builder().deptLiabilityId(deptLiability.getId()).build()));
+                List<DataCategory> list = new ArrayList<>();
+                for (DeptLiabilityCategory deptLiabilityCategory : liabilityCategoryList) {
+                    DataCategory dataCategory = dataCategoryDao.selectById(deptLiabilityCategory.getCategoryId());
+                    if (dataCategory != null) {
+                        AssertUtils.hasText(dataCategory.getCascadeguid(), dataCategory.getCataTitle() + "目录未注册");
+                        list.add(dataCategory);
+                    }
+                }
+                String cataId = list.stream().map(DataCategory::getCascadeguid).filter(StrUtil::isNotBlank).collect(Collectors.joining(";"));
+
+                params.put("cataId", cataId);
                 ShareApiResponse shareApiResponse = ShareApiUtils.doPost(params, ShareApiEnum.RESPONSIBILITY_ADD_UPDATE);
                 if (shareApiResponse.isSuccess()) {
                     deptLiability.setCascadeguid(shareApiResponse.getString("cascadeguid"));
@@ -318,4 +369,8 @@ public class DeptDutyService {
     public void deleteDeptLiabilityLabel(String id) {
         deptLiabilityLabelDao.deleteById(id);
     }
+
+    public void deleteDeptLiabilityCategory(String id) {
+        deptLiabilityCategoryDao.deleteById(id);
+    }
 }

resource-server/src/main/resources/application.yml

@@ -23,6 +23,14 @@ spring:
     #连接超时时间
     timeout: 5000
   datasource:
+    druid:
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
     dynamic: # mybatis plus多数据源插件
       primary: master #设置默认的数据源或者数据源组,默认值即为master
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
@@ -35,11 +43,11 @@ spring:
           url: ${ojdbc.mzzt.url}
       druid:
         # 初始连接数
-        initial-size: 10
+        initial-size: 5
         # 最小连接数
-        min-idle: 20
+        min-idle: 10
         # 最大连接数
-        max-active: 50
+        max-active: 20
         # 获取连接超时时间
         max-wait: 5000
         # 连接有效性检测时间

sync-server/src/main/java/com/zq/sync/controller/VolunteerController.java

+package com.zq.sync.controller;
+
+import com.zq.common.utils.AssertUtils;
+import com.zq.common.vo.ResultVo;
+import com.zq.sync.service.VolunteerService;
+import com.zq.sync.vo.GroupProSearchVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "志愿服务相关接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping(value = "/sync/volunteer")
+public class VolunteerController {
+    private final VolunteerService volunteerService;
+
+    /**
+     * 志愿者
+     * @return
+     */
+    @GetMapping(value = "/zyz")
+    public ResultVo volunteer() {
+        volunteerService.volunteer();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 志愿队伍
+     * @return
+     */
+    @GetMapping(value = "/zyteam")
+    public ResultVo zyteam() {
+        volunteerService.zyteam();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 志愿项目
+     * @return
+     */
+    @GetMapping(value = "/zyproject")
+    public ResultVo zyproject() {
+        volunteerService.zyproject();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 志愿时长
+     * @return
+     */
+    @GetMapping(value = "/zytime")
+    public ResultVo zytime() {
+        volunteerService.zytime();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     *  志愿者与队伍关系
+     *  @return
+     */
+    @GetMapping(value = "/zycontact")
+    public ResultVo zycontact() {
+        volunteerService.zycontact();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 分页查寻加入团体的志愿者
+     * @return
+     */
+    @GetMapping(value = "/searchByJoin")
+    public ResultVo searchByJoin() {
+        volunteerService.searchByJoin();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据团体id查询团体的志愿项目
+     * @return
+     */
+    @ApiOperation("根据团体id查询团体的志愿项目")
+    @PostMapping(value = "/searchById")
+    public ResultVo searchById(@RequestBody GroupProSearchVo vo) {
+        AssertUtils.hasText(vo.getGroupId(), "缺团体id");
+        AssertUtils.hasText(vo.getPage(), "缺分页页数");
+        AssertUtils.hasText(vo.getRow(), "缺分页行数");
+
+        return ResultVo.success(volunteerService.searchById(vo));
+    }
+
+    /**
+     * 根据身份证查询志愿
+     * @return
+     */
+    @GetMapping(value = "/searchByIDcard")
+    public ResultVo searchByIDcard() {
+        volunteerService.searchByIDcard();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据手机号查询志愿
+     * @return
+     */
+    @GetMapping(value = "/searchByPhone")
+    public ResultVo searchByPhone() {
+        volunteerService.searchByPhone();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据志愿者id查询项目
+     * @return
+     */
+    @GetMapping(value = "/searchProById")
+    public ResultVo searchProById() {
+        volunteerService.searchProById();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据志愿者id查询时长记录
+     * @return
+     */
+    @GetMapping(value = "/searchTimeRecordById")
+    public ResultVo searchTimeRecordById() {
+        volunteerService.searchTimeRecordById();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据志愿者来源与时间查询志愿者
+     * @return
+     */
+    @GetMapping(value = "/searchBySourceTime")
+    public ResultVo searchBySourceTime() {
+        volunteerService.searchBySourceTime();
+        return ResultVo.success("成功");
+    }
+}

sync-server/src/main/java/com/zq/sync/dao/GroupProSearchDao.java

+package com.zq.sync.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.common.constant.DBName;
+import com.zq.sync.entity.GroupProject;
+import org.springframework.stereotype.Repository;
+
+@DS(DBName.OZT) //数据库名
+@Repository
+public interface GroupProSearchDao extends BaseMapper<GroupProject> {
+}

sync-server/src/main/java/com/zq/sync/entity/Fdx01.java

@@ -282,5 +282,28 @@ public class Fdx01 {
      */
     @ApiModelProperty("修改时间")
     private Date afdx0818;
-    
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/Fdx02.java

@@ -282,5 +282,28 @@ public class Fdx02 {
      */
     @ApiModelProperty("修改时间")
     private Date afdx0818;
-    
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/Fdx03.java

@@ -120,5 +120,28 @@ public class Fdx03 {
      */
     @ApiModelProperty("乡镇")
     private String afdx0802;
-    
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/Fdx04.java

@@ -144,5 +144,28 @@ public class Fdx04 {
      */
     @ApiModelProperty("乡镇")
     private String afdx0802;
-    
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/Fdx05.java

@@ -144,5 +144,28 @@ public class Fdx05 {
      */
     @ApiModelProperty("乡镇")
     private String afdx0802;
-    
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/Fdx06.java

@@ -288,5 +288,28 @@ public class Fdx06 {
      */
     @ApiModelProperty("修改时间")
     private Date afdx0818;
-    
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/Fdx07.java

@@ -171,5 +171,27 @@ public class Fdx07 {
     @ApiModelProperty("护理补发人次")
     private Integer agax0922;
 
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
 
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/Fdx88.java

@@ -123,5 +123,28 @@ public class Fdx88 {
      */
     @ApiModelProperty("修改时间")
     private Date afdx0818;
-    
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/entity/GroupProject.java

+package com.zq.sync.entity;
+
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 团体志愿项目表(Groupproject)实体类
+ *
+ * @author makejava
+ * @since 2021-12-16 17:42:58
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GroupProject {
+
+    /**
+     * 项目名称
+     */
+    @ApiModelProperty("项目名称")
+    private String albx0002;
+    
+    /**
+     * 服务地点
+     */
+    @ApiModelProperty("服务地点")
+    private String albx0003;
+    
+    /**
+     * 项目开始时间
+     */
+    @ApiModelProperty("项目开始时间")
+    private Date albx0004;
+    
+    /**
+     * 项目结束时间
+     */
+    @ApiModelProperty("项目结束时间")
+    private Date albx0005;
+    
+    /**
+     * 招募开始时间
+     */
+    @ApiModelProperty("招募开始时间")
+    private Date albx0006;
+    
+    /**
+     * 招募结束时间
+     */
+    @ApiModelProperty("招募结束时间")
+    private Date albx0007;
+    
+    /**
+     * 项目进度
+     */
+    @ApiModelProperty("项目进度")
+    private String albx0008;
+    
+    /**
+     * 服务类别
+     */
+    @ApiModelProperty("服务类别")
+    private String albx0009;
+    
+    /**
+     * 服务时间描述
+     */
+    @ApiModelProperty("服务时间描述")
+    private String albx0010;
+    
+    /**
+     * 团体id
+     */
+    @ApiModelProperty("团体id")
+    private String albx0011;
+    
+    /**
+     * 区域名
+     */
+    @ApiModelProperty("区域名")
+    private String albx0012;
+    
+    /**
+     * 项目编号
+     */
+    @ApiModelProperty("项目编号")
+    private String albx0013;
+    
+    /**
+     * 服务对象
+     */
+    @ApiModelProperty("服务对象")
+    private String albx0014;
+    
+    /**
+     * 项目状态
+     */
+    @ApiModelProperty("项目状态")
+    private String albx0015;
+    
+    /**
+     * 正式成员人数
+     */
+    @ApiModelProperty("正式成员人数")
+    private String albx0016;
+    
+    /**
+     * 免审密码
+     */
+    @ApiModelProperty("免审密码")
+    private String albx0017;
+    
+    /**
+     * 项目描述
+     */
+    @ApiModelProperty("项目描述")
+    private String albx0018;
+    
+    /**
+     * 志愿者保障
+     */
+    @ApiModelProperty("志愿者保障")
+    private String albx0019;
+    
+    /**
+     * 照片
+     */
+    @ApiModelProperty("照片")
+    private String albx0020;
+    
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String albx0021;
+    
+    /**
+     * 可报名团体编号
+     */
+    @ApiModelProperty("可报名团体编号")
+    private String albx0022;
+    
+    /**
+     * 不可同时报名项目编号
+     */
+    @ApiModelProperty("不可同时报名项目编号")
+    private String albx0023;
+    
+    /**
+     * 志愿者招募范围
+     */
+    @ApiModelProperty("志愿者招募范围")
+    private String albx0024;
+    
+    /**
+     * 联系人姓名
+     */
+    @ApiModelProperty("联系人姓名")
+    private String albx0025;
+    
+    /**
+     * 联系人手机
+     */
+    @ApiModelProperty("联系人手机")
+    private String albx0026;
+    
+    /**
+     * 联系人手机是否公开
+     */
+    @ApiModelProperty("联系人手机是否公开")
+    private String albx0027;
+    
+    /**
+     * 联系人座机
+     */
+    @ApiModelProperty("联系人座机")
+    private String albx0028;
+    
+    /**
+     * 联系人座机是否公开
+     */
+    @ApiModelProperty("联系人座机是否公开")
+    private String albx0029;
+    
+    /**
+     * 联系人邮箱
+     */
+    @ApiModelProperty("联系人邮箱")
+    private String albx0030;
+    
+    /**
+     * 发布时间
+     */
+    @ApiModelProperty("发布时间")
+    private Date albx0031;
+    
+    /**
+     * 受众人次
+     */
+    @ApiModelProperty("受众人次")
+    private String albx0032;
+    
+    /**
+     * 报名前服务时长要求
+     */
+    @ApiModelProperty("报名前服务时长要求")
+    private String albx0033;
+    
+    /**
+     * 报名问题一
+     */
+    @ApiModelProperty("报名问题一")
+    private String albx0034;
+    
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private String albx0035;
+    
+    /**
+     * 纬度
+     */
+    @ApiModelProperty("纬度")
+    private String albx0036;
+    
+    /**
+     * 是否推荐
+     */
+    @ApiModelProperty("是否推荐")
+    private String albx0037;
+    
+    /**
+     * 项目管理员（志愿者编号）
+     */
+    @ApiModelProperty("项目管理员（志愿者编号）")
+    private String albx0038;
+    
+    /**
+     * 二维码生成日期|
+     */
+    @ApiModelProperty("二维码生成日期|")
+    private Date albx0039;
+    
+    /**
+     * 二维码路径
+     */
+    @ApiModelProperty("二维码路径")
+    private String albx0040;
+    
+    /**
+     * 结项时间
+     */
+    @ApiModelProperty("结项时间")
+    private String albx0041;
+    
+    /**
+     * 服务类别是否属于全国其他
+     */
+    @ApiModelProperty("服务类别是否属于全国其他")
+    private String albx0042;
+    
+    /**
+     * 岗位数
+     */
+    @ApiModelProperty("岗位数")
+    private String albx0043;
+    
+    /**
+     * 计划招募总数
+     */
+    @ApiModelProperty("计划招募总数")
+    private String albx0044;
+    
+    /**
+     * 其他服务类别
+     */
+    @ApiModelProperty("其他服务类别")
+    private String albx0045;
+    
+    /**
+     * 推荐时间
+     */
+    @ApiModelProperty("推荐时间")
+    private Date albx0046;
+    
+    /**
+     * 证明照片
+     */
+    @ApiModelProperty("证明照片")
+    private String albx0047;
+    
+    /**
+     * 原数据
+     */
+    @ApiModelProperty("原数据")
+    private String pid;
+    
+}
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/service/DisabledService.java

@@ -59,6 +59,10 @@ public class DisabledService {
                         .afdx0816(fdx88.getAfdx0816())
                         .afdx0817(fdx88.getAfdx0817()!=null? DateUtil.format(fdx88.getAfdx0817(), DatePattern.NORM_DATETIME_PATTERN):"")
                         .afdx0818(fdx88.getAfdx0818()!=null? DateUtil.format(fdx88.getAfdx0818(), DatePattern.NORM_DATETIME_PATTERN):"")
+                        .serialNumner(fdx88.getSerialNumner())
+                        .dataStatus(fdx88.getDataStatus())
+                        .dataTime(fdx88.getDataTime())
+                        .areaCode(fdx88.getAreaCode())
                         .build();
 
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_btdxlxxx")
@@ -123,6 +127,10 @@ public class DisabledService {
                         .agax0920(fdx07.getAgax0920())
                         .agax0921(fdx07.getAgax0921())
                         .agax0922(fdx07.getAgax0922())
+                        .serialNumner(fdx07.getSerialNumner())
+                        .dataStatus(fdx07.getDataStatus())
+                        .dataTime(fdx07.getDataTime())
+                        .areaCode(fdx07.getAreaCode())
                         .build();
 
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_ffhzxx")
@@ -205,6 +213,10 @@ public class DisabledService {
                         .afdx0870(fdx06.getAfdx0870()!=null? DateUtil.format(fdx06.getAfdx0870(), DatePattern.NORM_MONTH_PATTERN):"")
                         .afdx0817(fdx06.getAfdx0817()!=null? DateUtil.format(fdx06.getAfdx0817(), DatePattern.NORM_MONTH_PATTERN):"")
                         .afdx0818(fdx06.getAfdx0818()!=null? DateUtil.format(fdx06.getAfdx0818(), DatePattern.NORM_MONTH_PATTERN):"")
+                        .serialNumner(fdx06.getSerialNumner())
+                        .dataStatus(fdx06.getDataStatus())
+                        .dataTime(fdx06.getDataTime())
+                        .areaCode(fdx06.getAreaCode())
                         .build();
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_lsxx")
                         .form("access_key", "mzb_gx_450000")
@@ -262,6 +274,10 @@ public class DisabledService {
                         .afdx0807(fdx05.getAfdx0807())
                         .afdx0808(fdx05.getAfdx0808())
                         .afdx0802(fdx05.getAfdx0802())
+                        .serialNumner(fdx05.getSerialNumner())
+                        .dataStatus(fdx05.getDataStatus())
+                        .dataTime(fdx05.getDataTime())
+                        .areaCode(fdx05.getAreaCode())
                         .build();
 
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_zjryxx")
@@ -321,6 +337,10 @@ public class DisabledService {
                         .afdx0807(fdx04.getAfdx0807())
                         .afdx0808(fdx04.getAfdx0808())
                         .afdx0802(fdx04.getAfdx0802())
+                        .serialNumner(fdx04.getSerialNumner())
+                        .dataStatus(fdx04.getDataStatus())
+                        .dataTime(fdx04.getDataTime())
+                        .areaCode(fdx04.getAreaCode())
                         .build();
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_bfryxx")
                         .form("access_key", "mzb_gx_450000")
@@ -374,6 +394,10 @@ public class DisabledService {
                         .afdx0807(fdx03.getAfdx0807())
                         .afdx0808(fdx03.getAfdx0808())
                         .afdx0802(fdx03.getAfdx0802())
+                        .serialNumner(fdx03.getSerialNumner())
+                        .dataStatus(fdx03.getDataStatus())
+                        .dataTime(fdx03.getDataTime())
+                        .areaCode(fdx03.getAreaCode())
                         .build();
 
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_tfryxx")
@@ -455,6 +479,10 @@ public class DisabledService {
                         .afdx0870(fdx02.getAfdx0870()!=null? DateUtil.format(fdx02.getAfdx0870(), DatePattern.NORM_MONTH_PATTERN):"")
                         .afdx0817(fdx02.getAfdx0817()!=null? DateUtil.format(fdx02.getAfdx0817(), DatePattern.NORM_MONTH_PATTERN):"")
                         .afdx0818(fdx02.getAfdx0818()!=null? DateUtil.format(fdx02.getAfdx0818(), DatePattern.NORM_MONTH_PATTERN):"")
+                        .serialNumner(fdx02.getSerialNumner())
+                        .dataStatus(fdx02.getDataStatus())
+                        .dataTime(fdx02.getDataTime())
+                        .areaCode(fdx02.getAreaCode())
                         .build();
 
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_xzryxx")
@@ -537,6 +565,10 @@ public class DisabledService {
                         .afdx0870(fdx01.getAfdx0870()!=null? DateUtil.format(fdx01.getAfdx0870(), DatePattern.NORM_MONTH_PATTERN):"")
                         .afdx0817(fdx01.getAfdx0817()!=null? DateUtil.format(fdx01.getAfdx0817(), DatePattern.NORM_MONTH_PATTERN):"")
                         .afdx0818(fdx01.getAfdx0818()!=null? DateUtil.format(fdx01.getAfdx0818(), DatePattern.NORM_MONTH_PATTERN):"")
+                        .serialNumner(fdx01.getSerialNumner())
+                        .dataStatus(fdx01.getDataStatus())
+                        .dataTime(fdx01.getDataTime())
+                        .areaCode(fdx01.getAreaCode())
                         .build();
 
                 HttpRequest request = HttpRequest.post("https://59.255.186.1/yhbcp-engine_gov/rest/cjrfl_report_zcryxx")

sync-server/src/main/java/com/zq/sync/service/VolunteerService.java

+package com.zq.sync.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zq.common.utils.AssertUtils;
+import com.zq.sync.dao.GroupProSearchDao;
+import com.zq.sync.entity.GroupProject;
+import com.zq.sync.vo.GroupProSearchVo;
+import com.zq.sync.vo.GroupProVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Comparator;
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class VolunteerService {
+
+    private final GroupProSearchDao groupProSearchDao;
+
+    public void volunteer() {
+    }
+
+    public void zyteam() {
+    }
+
+    public void zyproject() {
+    }
+
+    public void zytime() {
+    }
+
+    public void zycontact() {
+    }
+
+    public void searchByJoin() {
+    }
+
+    public GroupProVo searchById(GroupProSearchVo vo) {
+       List<GroupProject> groupProList= groupProSearchDao.selectList(Wrappers.lambdaQuery(GroupProject.builder().albx0011("id").build()));
+       AssertUtils.notEmpty(groupProList, "查询为空");
+        GroupProject groupProject = groupProList.stream().max(Comparator.comparing(GroupProject::getAlbx0011)).get();
+
+        return GroupProVo.builder().groupId(groupProject.getAlbx0011()).build();
+    }
+
+    public void searchByIDcard() {
+    }
+
+    public void searchByPhone() {
+    }
+
+    public void searchProById() {
+    }
+
+    public void searchTimeRecordById() {
+    }
+
+    public void searchBySourceTime() {
+    }
+}

sync-server/src/main/java/com/zq/sync/task/ReportTask.java

@@ -18,7 +18,42 @@ public class ReportTask {
      * 每月16日执行上报
      */
     @Scheduled(cron = "0 0 0 16 * ?")
-    public void fdx88(){
+    public void fdx88() {
         disabledService.fdx88();
     }
+
+    @Scheduled(cron = "0 0 0 16 * ?")
+    public void fdx07(){
+        disabledService.fdx07();
+    }
+
+    @Scheduled(cron = "0 0 0 16 * ?")
+    public void fdx06(){
+        disabledService.fdx06();
+    }
+
+    @Scheduled(cron = "0 0 0 16 * ?")
+    public void fdx05(){
+        disabledService.fdx05();
+    }
+
+    @Scheduled(cron = "0 0 0 16 * ?")
+    public void fdx04(){
+        disabledService.fdx04();
+    }
+
+    @Scheduled(cron = "0 0 0 16 * ?")
+    public void fdx03(){
+        disabledService.fdx03();
+    }
+
+    @Scheduled(cron = "0 0 0 16 * ?")
+    public void fdx02(){
+        disabledService.fdx02();
+    }
+
+    @Scheduled(cron = "0 0 0 16 * ?")
+    public void fdx01(){
+        disabledService.fdx01();
+    }
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx01Vo.java

@@ -278,4 +278,28 @@ public class Fdx01Vo {
      */
     @ApiModelProperty("修改时间")
     private String afdx0818;
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx02Vo.java

@@ -7,6 +7,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 
 @Data
 @AllArgsConstructor
@@ -277,4 +279,28 @@ public class Fdx02Vo {
      */
     @ApiModelProperty("修改时间")
     private String afdx0818;
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx03Vo.java

@@ -7,6 +7,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 
 
 @Data
@@ -116,4 +117,28 @@ public class Fdx03Vo {
      */
     @ApiModelProperty("乡镇")
     private String afdx0802;
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx04Vo.java

@@ -140,4 +140,28 @@ public class Fdx04Vo {
      */
     @ApiModelProperty("乡镇")
     private String afdx0802;
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx05Vo.java

@@ -7,6 +7,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 
 @Data
 @AllArgsConstructor
@@ -140,4 +142,28 @@ public class Fdx05Vo {
      */
     @ApiModelProperty("乡镇")
     private String afdx0802;
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx06Vo.java

@@ -283,4 +283,28 @@ public class Fdx06Vo {
      */
     @ApiModelProperty("修改时间")
     private String afdx0818;
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx07Vo.java

@@ -7,6 +7,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 
 @Data
 @AllArgsConstructor
@@ -165,4 +167,27 @@ public class Fdx07Vo {
     @ApiModelProperty("护理补发人次")
     private Integer agax0922;
 
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/Fdx88Vo.java

@@ -116,4 +116,28 @@ public class Fdx88Vo {
      */
     @ApiModelProperty("修改时间")
     private String afdx0818;
+
+    /**
+     * 数据唯一流水号
+     */
+    @ApiModelProperty("数据唯一流水号")
+    private String serialNumner;
+
+    /**
+     * 数据状态
+     */
+    @ApiModelProperty("数据状态")
+    private String dataStatus;
+
+    /**
+     * 数据上报时间
+     */
+    @ApiModelProperty("数据上报时间")
+    private Date dataTime;
+
+    /**
+     * 区划代码
+     */
+    @ApiModelProperty("区划代码")
+    private String areaCode;
 }

sync-server/src/main/java/com/zq/sync/vo/GroupProSearchVo.java

+package com.zq.sync.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class GroupProSearchVo {
+    @ApiModelProperty("团体id")
+    private String groupId;
+
+    @ApiModelProperty("分页页数")
+    private String page;
+
+    @ApiModelProperty("分页行数")
+    private String row;
+}

sync-server/src/main/java/com/zq/sync/vo/GroupProVo.java

+package com.zq.sync.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GroupProVo {
+
+    @ApiModelProperty("团体id")
+    private String groupId;
+
+    @ApiModelProperty("分页页数")
+    private String page;
+
+    @ApiModelProperty("分页行数")
+    private String row;
+}

sync-server/src/main/resources/application.yml

@@ -5,6 +5,14 @@ spring:
   application:
     name: SYNC-SERVER
   datasource:
+    druid:
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
     dynamic: # mybatis plus多数据源插件
       primary: master #设置默认的数据源或者数据源组,默认值即为master
       strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
@@ -17,11 +25,11 @@ spring:
           url: jdbc:mysql://192.168.0.197:10008/gx_cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       druid:
         # 初始连接数
-        initial-size: 10
+        initial-size: 5
         # 最小连接数
-        min-idle: 20
+        min-idle: 10
         # 最大连接数
-        max-active: 50
+        max-active: 20
         # 获取连接超时时间
         max-wait: 5000
         # 连接有效性检测时间

sys-server/src/main/java/com/zq/system/config/CacheKeys.java

@@ -20,5 +20,15 @@ public class CacheKeys extends BaseCacheKeys {
         return AUTH_CODE + phone;
     }
 
+    /**
+     * 构造加密key的缓存key
+     *
+     * @param token
+     * @return
+     */
+    public static String apiKey(String token) {
+        return PREFIX + "apiKey." + token;
+    }
+
 
 }

sys-server/src/main/java/com/zq/system/config/security/TokenProvider.java

@@ -18,8 +18,10 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.zq.common.config.security.SecurityProperties;
+import cn.hutool.core.util.StrUtil;
 import com.zq.common.config.redis.RedisUtils;
+import com.zq.common.config.security.SecurityProperties;
+import com.zq.system.config.CacheKeys;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -121,10 +123,9 @@ public class TokenProvider implements InitializingBean {
             long renew = time + properties.getRenew();
             redisUtils.expire(properties.getOnlineKey() + token, renew, TimeUnit.MILLISECONDS);
 
-            //api接口key续期
-            String key =redisUtils.getStr(token);
-            if(com.zq.common.utils.StringUtils.isNotBlank(key)){
-                redisUtils.expire(token, renew, TimeUnit.MILLISECONDS);
+            String key = redisUtils.getStr(CacheKeys.apiKey(token));
+            if (StrUtil.isNotBlank(key)) {
+                redisUtils.expire(CacheKeys.apiKey(token), renew, TimeUnit.MILLISECONDS);
             }
         }
     }

sys-server/src/main/java/com/zq/system/exception/handler/GlobalExceptionHandler.java

@@ -15,14 +15,11 @@
  */
 package com.zq.system.exception.handler;
 
-import com.zq.common.exception.BusinessException;
 import com.zq.common.utils.ThrowableUtil;
-import com.zq.common.vo.ResultVo;
 import com.zq.system.exception.BadRequestException;
 import com.zq.system.exception.EntityExistException;
 import com.zq.system.exception.EntityNotFoundException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -30,7 +27,6 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
 
 import static org.springframework.http.HttpStatus.NOT_FOUND;
@@ -53,18 +49,6 @@ public class GlobalExceptionHandler {
         return buildResponseEntity(ApiError.error(e.getMessage()));
     }
 
-    @ExceptionHandler(BusinessException.class)
-    public ResultVo handleBusinessException(BusinessException ex, HttpServletRequest request) {
-        log.info(">> business exception: {}, {}, {}", request.getRequestURI(), ex.getCode(), ex.getMessage());
-        String errMessage = ex.getMessage();
-        // 防止空的错误信息
-        if (StringUtils.isBlank(errMessage)) {
-            errMessage = "服务器繁忙";
-            log.warn(">> 空的业务错误信息", ex);
-        }
-        return ResultVo.fail(ex.getCode(), errMessage);
-    }
-
     /**
      * BadCredentialsException
      */

sys-server/src/main/java/com/zq/system/modules/system/domain/vo/SingleLoginVo.java → sys-server/src/main/java/com/zq/system/modules/system/domain/vo/SsoLoginVo.java

@@ -7,7 +7,7 @@ import lombok.Data;
  * @since 2021/11/26 16:37
  */
 @Data
-public class SingleLoginVo {
+public class SsoLoginVo {
 
     private Long systemId;
 

sys-server/src/main/java/com/zq/system/modules/system/rest/SingleController.java → sys-server/src/main/java/com/zq/system/modules/system/rest/SsoController.java

@@ -6,9 +6,9 @@ import com.zq.common.utils.AssertUtils;
 import com.zq.common.vo.IdVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.system.modules.system.domain.User;
-import com.zq.system.modules.system.domain.vo.SingleLoginVo;
+import com.zq.system.modules.system.domain.vo.SsoLoginVo;
 import com.zq.system.modules.system.service.AuthUserDto;
-import com.zq.system.modules.system.service.SingleService;
+import com.zq.system.modules.system.service.SsoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -25,60 +25,60 @@ import javax.servlet.http.HttpServletResponse;
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "单点登录")
-@RequestMapping("/sys/single")
-public class SingleController {
+@RequestMapping("/sys/sso")
+public class SsoController {
 
-    private final SingleService singleService;
+    private final SsoService ssoService;
 
     @ApiOperation("单点登录")
     @AnonymousPostMapping(value = "/login")
-    public ResultVo login(@RequestBody SingleLoginVo vo, HttpServletRequest request, HttpServletResponse response) {
+    public ResultVo login(@RequestBody SsoLoginVo vo, HttpServletRequest request, HttpServletResponse response) {
         AssertUtils.hasText(vo.getUsername(), "用户名为空");
         AssertUtils.hasText(vo.getPasswd(), "密码为空");
 
-        return ResultVo.success(singleService.login(vo, request, response));
+        return ResultVo.success(ssoService.login(vo, request, response));
     }
 
     @ApiOperation("token单点登录")
     @PostMapping(value = "/tokenLogin")
     public ResultVo tokenLogin(HttpServletRequest request, HttpServletResponse response) {
-        return ResultVo.success(singleService.tokenLogin(request, response));
+        return ResultVo.success(ssoService.tokenLogin(request, response));
     }
 
     @ApiOperation("单点登出")
     @AnonymousGetMapping(value = "/logout")
     public void logout(HttpServletRequest request) {
-        singleService.logout(request);
+        ssoService.logout(request);
     }
 
     @ApiOperation("获取用户信息")
     @GetMapping(value = "/getUserInfo/{appId}")
     public ResultVo getUserInfo(@PathVariable String appId) {
-        return ResultVo.success(singleService.getUserInfo(appId));
+        return ResultVo.success(ssoService.getUserInfo(appId));
     }
 
     @ApiOperation("注册单点登录用户")
     @AnonymousPostMapping(value = "/register")
     public ResultVo register(@Validated(User.Create.class) @RequestBody User resources) {
-        singleService.register(resources);
+        ssoService.register(resources);
         return ResultVo.success("注册成功");
     }
 
     @ApiOperation("用户绑定系统")
     @PostMapping(value = "/bindSystem")
-    public ResultVo bindSystem(@RequestBody SingleLoginVo vo) {
+    public ResultVo bindSystem(@RequestBody SsoLoginVo vo) {
         AssertUtils.notNull(vo.getSystemId(), "缺少系统ID");
         AssertUtils.hasText(vo.getUsername(), "缺少用户名");
         AssertUtils.hasText(vo.getPasswd(), "缺少密码");
 
-        singleService.bindSystem(vo);
+        ssoService.bindSystem(vo);
         return ResultVo.success();
     }
 
     @ApiOperation("用户绑定的系统列表")
     @GetMapping(value = "/getBindSysList")
     public ResultVo getBindSysList() {
-        return ResultVo.success(singleService.getBindSysList());
+        return ResultVo.success(ssoService.getBindSysList());
     }
 
     @ApiOperation("取消绑定")
@@ -86,14 +86,14 @@ public class SingleController {
     public ResultVo cancelBlind(@RequestBody IdVo vo) {
         AssertUtils.notNull(vo.getIds());
 
-        singleService.cancelBind(vo.getIds());
+        ssoService.cancelBind(vo.getIds());
         return ResultVo.success();
     }
 
     @ApiOperation("注册查用户名是否已存在")
     @AnonymousGetMapping("/userNameIsExist/{userName}")
     public ResultVo userNameIsExist(@PathVariable("userName") String userName) {
-        singleService.userNameIsExist(userName);
+        ssoService.userNameIsExist(userName);
         return ResultVo.success();
     }
 
@@ -102,6 +102,6 @@ public class SingleController {
     public ResultVo verifyPasswd(AuthUserDto vo) {
         AssertUtils.hasText(vo.getUsername(), "缺少用户名");
         AssertUtils.hasText(vo.getPassword(), "缺少密码");
-        return ResultVo.success(singleService.verifyPasswd(vo));
+        return ResultVo.success(ssoService.verifyPasswd(vo));
     }
 }

sys-server/src/main/java/com/zq/system/modules/system/rest/UserController.java

@@ -66,7 +66,7 @@ public class UserController {
     private final DeptService deptService;
     private final RoleService roleService;
     private final VerifyService verificationCodeService;
-    private final SingleService singleService;
+    private final SsoService ssoService;
 
     @ApiOperation("导出用户数据")
     @GetMapping(value = "/download")

sys-server/src/main/java/com/zq/system/modules/system/service/SingleService.java → sys-server/src/main/java/com/zq/system/modules/system/service/SsoService.java

@@ -13,6 +13,7 @@ import com.zq.common.exception.BusinessException;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.vo.OnlineUserDto;
 import com.zq.common.vo.ResultVo;
+import com.zq.system.config.CacheKeys;
 import com.zq.system.config.RsaProperties;
 import com.zq.system.config.security.TokenProvider;
 import com.zq.system.modules.system.dao.BlindUserInfoDao;
@@ -20,7 +21,7 @@ import com.zq.system.modules.system.dao.SysInfoDao;
 import com.zq.system.modules.system.domain.Job;
 import com.zq.system.modules.system.domain.Role;
 import com.zq.system.modules.system.domain.User;
-import com.zq.system.modules.system.domain.vo.SingleLoginVo;
+import com.zq.system.modules.system.domain.vo.SsoLoginVo;
 import com.zq.system.modules.system.entity.BindUserInfo;
 import com.zq.system.modules.system.entity.SysInfo;
 import com.zq.system.modules.system.repository.DeptRepository;
@@ -50,7 +51,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class SingleService {
+public class SsoService {
 
     private final UserRepository userRepository;
     private final BlindUserInfoDao blindUserInfoDao;
@@ -104,7 +105,7 @@ public class SingleService {
         AssertUtils.isTrue(user == null, "用户名已存在");
     }
 
-    public void bindSystem(SingleLoginVo vo) {
+    public void bindSystem(SsoLoginVo vo) {
         OnlineUserDto adminContext = ContextUtils.getAdminContext();
         List<BindUserInfo> bindUserInfos = blindUserInfoDao.selectList(Wrappers.lambdaQuery(BindUserInfo.builder().userId(adminContext.getUserId())
                 .sysId(vo.getSystemId()).build()));
@@ -144,7 +145,7 @@ public class SingleService {
         blindUserInfoDao.insert(build);
     }
 
-    public Object login(SingleLoginVo vo, HttpServletRequest request, HttpServletResponse response) {
+    public Object login(SsoLoginVo vo, HttpServletRequest request, HttpServletResponse response) {
         try {
             String toUrl = request.getParameter("service");
             AssertUtils.hasText(toUrl, "跳转地址为空");
@@ -166,7 +167,7 @@ public class SingleService {
             onlineUserService.save(jwtUserDto, token, request);
 
             String key = IdUtil.simpleUUID();
-            redisUtils.setStr(token, key, properties.getTokenValidityInSeconds() / 1000, TimeUnit.SECONDS);
+            redisUtils.setStr(CacheKeys.apiKey(token), key, properties.getTokenValidityInSeconds() / 1000, TimeUnit.SECONDS);
 
             Map<String, Object> data = new HashMap<>();
             data.put("toUrl", toUrl + "?" + properties.getHeader() + "=" + token + "&key=" + key);

sys-server/src/main/resources/application.yml

@@ -15,6 +15,14 @@ spring:
     # 连接超时时间
     timeout: 5000
   datasource:
+    druid:
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
     dynamic: # mybatis plus多数据源插件
       primary: master #设置默认的数据源或者数据源组,默认值即为master
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源