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

guoshilong

2023-08-10 3ae4d79b6680570b56f0480dd0685c024e6acff4

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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml

@@ -92,7 +92,7 @@
        ) ctc
        on ctr."call_id" = ctc."call_id"
        left join "SJZT_MD"."att_res_base" arb on ctc.waterCode = arb."code"
        left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000')
        left join "SJZT_MD"."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
        left join
        (
        SELECT ctra."call_id", replace(WM_CONCAT(ctag."tag_title"),',', ',') as "tag_title" from "SJZT_ODS"."call_tag" ctag
@@ -201,65 +201,76 @@

    <!--查询智能外呼统计数据-按日期-行政区统计-->
    <select id="getOutgoingStatisticList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
        select  aab."guid",
        aab."ad_name" as adName,
        createTime,
        ifnull(sum(totalCount),0) as calleeNumberCount,
        ifnull(sum(connectCount),0) as connectionCount,
        ifnull(sum(resConnectCount),0) as refuseConnectCount,
        ifnull(sum(threeNotConnectCount),0) as threeNoConnectCount
        from SJZT_MD."att_ad_base"  aab
        left join (
        select
        aab."guid",aab."ad_name",
        ifnull(totalCount,0) as calleeNumberCount,
        ifnull(connectCount,0) as connectionCount,
        ifnull(threeNotConnectCount,0) as threeNoConnectCount,
        ifnull(resConnectCount,0) as refuseConnectCount
        from SJZT_MD."att_ad_base" aab left join(
            select
            ifnull(sum(case when ctc1."call_result"!='' then 1 else 0 end),0) as totalCount,
            ifnull(sum(case when ctc1."call_result"='200000' then 1 when scnfr.id is not null then 1 else 0 end),0) as connectCount,
            ifnull(sum(case when scnfr.id is not null then 0 when ctc1."call_result"='200003' then 1 else 0 end),0) as threeNotConnectCount,
            ifnull(sum(case when scnfr.id is not null then 0 when ctc1."call_result"='200005' then 1 else 0 end),0) as resConnectCount,
            DATE_FORMAT(ctc1."gmt_create",'%Y-%m-%d') as createTime,
            aab."guid",
            aab."ad_grad",
            aab."p_ad_code",
            aab."ad_name" as adName
            from
            aab."guid",aab."ad_name",
            ifnull(sum(totalCount),0) as totalCount,
            ifnull(sum(connectCount),0) as connectCount,
            ifnull(sum(threeNotConnectCount),0) as threeNotConnectCount,
            ifnull(sum(resConnectCount),0) as resConnectCount
            from SJZT_MD."att_ad_base"  aab join
            (
                select ctr.*,waterCode from SJZT_ODS."call_task_result" ctr right join
                (
                    select max("gmt_create") "gmt_create",waterCode,"callee_number" from (
                        select ctr.*,ctc.waterCode from SJZT_ODS."call_task_result" ctr right join (
                        select date_format(create_time,'%Y-%m-%d') time,wm_concat(task_id) task_id from YWXT.sm_daily_call_task group by date_format(create_time,'%Y-%m-%d')
                        ) sdct on locate(ctr."task_id",sdct.task_id) >0
                        left join (
                        select "call_id",JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode from "SJZT_ODS"."call_task_callee"
                        ) ctc on ctr."call_id" = ctc."call_id"
                        where 1=1 and sdct.time = #{callTaskStatistic.createTime}
                    ) a group by date_format("gmt_create",'%Y-%m-%d'),waterCode,"callee_number"
                ) b on ctr."gmt_create" = b."gmt_create" and ctr."callee_number" = b."callee_number"
            ) ctc1
            left join "SJZT_MD"."att_res_base" arb on ctc1.waterCode = arb."code"
            left join "SJZT_MD"."att_ad_base" aab on aab."guid" = arb."interior_ad_guid" or aab."guid" = concat(arb."ad_guid",'000000')
            left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctc1."call_id"
            where 1=1 and aab."ad_name" is not null
            <if test="callTaskStatistic.createTime!=null and callTaskStatistic.createTime!=''">
                and date_format(ctc1."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
                select b.*,aab."ad_name" as "city_name",aab."ad_grad" as "city_grad",aab."p_ad_code" as "province_code"
                from SJZT_MD."att_ad_base" aab join (
                    select a.*,aab."ad_name" as "county_name",aab."ad_grad" as "county_grad",aab."p_ad_code" as "city_code"
                    from SJZT_MD."att_ad_base" aab join(
                        select
                        ifnull(sum(case when ctc1."call_result"!='' then 1 else 0 end),0) as totalCount,
                        ifnull(sum(case when ctc1."call_result"='200000' then 1 when scnfr.id is not null then 1 else 0 end),0) as connectCount,
                        ifnull(sum(case when scnfr.id is not null then 0
                        when ctc1."call_result"='200001' then 1
                        when ctc1."call_result"='200003' then 1
                        when ctc1."call_result"='200002' then 1
                        when ctc1."call_result"='200004' then 1
                        when ctc1."call_result"='200007' then 1
                        when ctc1."call_result"='200010' then 1
                        when ctc1."call_result"='200011' then 1
                        when ctc1."call_result"='200100' then 1
                        when ctc1."call_result"='200130' then 1
                        else 0 end),0) as threeNotConnectCount,
                        ifnull(sum(case when scnfr.id is not null then 0 when ctc1."call_result"='200005' then 1 else 0 end),0) as resConnectCount,
                        aab."guid" as "town_code",
                        aab."ad_name" as "town_name",
                        aab."ad_grad" as "town_grad",
                        aab."p_ad_code" as "county_code"
                        from
                        (
                            select ctr.*,waterCode from SJZT_ODS."call_task_result" ctr right join
                            (
                                select max("gmt_create") "gmt_create",waterCode,"callee_number" from (
                                    select ctr.*,ctc.waterCode from SJZT_ODS."call_task_result" ctr right join (
                                        select date_format(create_time,'%Y-%m-%d') time,wm_concat(task_id) task_id from YWXT.sm_daily_call_task group by date_format(create_time,'%Y-%m-%d')
                                    ) sdct on locate(ctr."task_id",sdct.task_id) >0
                                    left join (
                                        select "call_id",JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode from "SJZT_ODS"."call_task_callee"
                                    ) ctc on ctr."call_id" = ctc."call_id"
                                    where 1=1 and sdct.time >= #{callTaskStatistic.startTime} and sdct.time &lt;= #{callTaskStatistic.endTime}
                                ) a group by date_format("gmt_create",'%Y-%m-%d'),waterCode,"callee_number"
                            ) b on ctr."gmt_create" = b."gmt_create" and ctr."callee_number" = b."callee_number"
                        ) ctc1
                        left join "SJZT_MD"."att_res_base" arb on ctc1.waterCode = arb."code"
                        left join "SJZT_MD"."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
                        left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctc1."call_id"
                        where 1=1
                        group by aab."ad_name",aab."guid",aab."ad_grad",aab."p_ad_code"
                    ) a on aab."guid" = a."county_code"
                ) b on aab."guid" = b."city_code"
            ) c
            <if test="callTaskStatistic.grad==1">
                on aab."guid" = c."city_code" or (aab."guid" = c."county_code" and c."county_grad" = 2) or (aab."guid" = c."county_code" and c."county_grad" = 1)
                where aab."ad_grad" = 2
            </if>
            <if test="callTaskStatistic.startTime!=null and callTaskStatistic.startTime!=''">
                and date_format(ctc1."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}
            </if>
            <if test="callTaskStatistic.endTime!=null and callTaskStatistic.endTime!=''">
                and date_format(ctc1."gmt_create",'%Y-%m-%d') &lt;= #{callTaskStatistic.endTime}
            </if>
            group by DATE_FORMAT(ctc1."gmt_create",'%Y-%m-%d'),aab."ad_name",aab."guid",aab."ad_grad",aab."p_ad_code"
        ) a
            group by aab."guid",aab."ad_name"
        ) d on d."guid" = aab."ad_code"
        <if test="callTaskStatistic.grad==1">
            on aab."guid" = a."p_ad_code" where aab."p_ad_code" = #{callTaskStatistic.adCode}
            where aab."ad_grad" =2
        </if>
        <if test="callTaskStatistic.grad==2">
            on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}
        </if>
        <if test="callTaskStatistic.grad==3">
            on aab."guid" = a."guid" where aab."ad_code" = #{callTaskStatistic.adCode}
        </if>
        group by createTime,aab."ad_name",aab."guid"
        order by aab."guid"
    </select>

@@ -522,63 +533,79 @@

    <!--查询当前天除去日常呼叫外的统计数据-->
    <select id="getNoDayOutgoingStatisticList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
        select  aab."guid",
        aab."ad_name" as adName,
        createTime,
        ifnull(sum(totalCount),0) calleeNumberCount,
        ifnull(sum(connectCount),0) + ifnull(sum(isSmsFillCount),0) as connectionCount,
        ifnull(sum(threeNotConnectCount),0) - ifnull(sum(threeNotConnectCount1),0) as threeNoConnectCount,
        ifnull(sum(resConnectCount1),0) - ifnull(sum(resConnectCount2),0) refuseConnectCount
        from SJZT_MD."att_ad_base"  aab
        left join (
        select
        aab."guid",aab."ad_name",
        ifnull(totalCount,0) as calleeNumberCount,
        ifnull(connectCount,0) as connectionCount,
        ifnull(threeNotConnectCount,0) as threeNoConnectCount,
        ifnull(resConnectCount,0) as refuseConnectCount
        from SJZT_MD."att_ad_base"  aab left join(
            select
            ifnull(sum(case when ctc."call_result"!='' then 1 else 0 end),0) as totalCount,
            ifnull(sum(case when ctc."call_result"='200000' then 1 else 0 end),0) as connectCount,
            ifnull(sum(case when ctc.task_id!='' then 1 else 0 end),0)as isSmsFillCount,
            ifnull(sum(case when ctc."call_result"='200003' then 1 else 0 end),0) as threeNotConnectCount,
            ifnull(sum(case when ctc.task_id!='' and ctc."call_result"='200003' then 1 else 0 end),0) as threeNotConnectCount1,
            ifnull(sum(case when ctc."call_result"='200005' then 1 else 0 end),0) as resConnectCount1,
            ifnull(sum(case when ctc.task_id!='' and ctc."call_result"='200005' then 1 else 0 end),0) as resConnectCount2,
            DATE_FORMAT(ctc."gmt_create",'%Y-%m-%d') as createTime,
            aab."guid",
            aab."ad_grad",
            aab."p_ad_code",
            aab."ad_name" as adName
            from
            aab."guid",aab."ad_name",
            ifnull(sum(totalCount),0) as totalCount,
            ifnull(sum(connectCount),0) as connectCount,
            ifnull(sum(threeNotConnectCount),0) as threeNotConnectCount,
            ifnull(sum(resConnectCount),0) as resConnectCount
            from SJZT_MD."att_ad_base"  aab join
            (
            select ctc."gmt_create",ctc."call_id",ctc."task_id",JSON_VALUE(ctc."call_task_callee_content",'$."$水库编码$"') as waterCode,ctr."call_result",scnfr.task_id from "SJZT_ODS"."call_task_callee" ctc
            left join SJZT_ODS."call_task" ct on ct."id" = ctc."task_id"
            left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = ctc."call_id"
            left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"
            left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
            where 1=1
            and sdct.task_id is null
            <if test="callTaskStatistic.createTime!=null and callTaskStatistic.createTime!=''">
                and date_format(ctc."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
                select b.*,aab."ad_name" as "city_name",aab."ad_grad" as "city_grad",aab."p_ad_code" as "province_code"
                from SJZT_MD."att_ad_base" aab join (
                    select a.*,aab."ad_name" as "county_name",aab."ad_grad" as "county_grad",aab."p_ad_code" as "city_code"
                    from SJZT_MD."att_ad_base" aab join(
                        select
                        ifnull(sum(case when ctc."call_result"!='' then 1 else 0 end),0) as totalCount,
                        ifnull(sum(case when ctc."call_result"='200000' then 1 when ctc.task_id is not null then 1 else 0 end),0) as connectCount,
                        ifnull(sum(case when ctc.task_id is not null then 0
                        when ctc."call_result"='200001' then 1
                        when ctc."call_result"='200003' then 1
                        when ctc."call_result"='200002' then 1
                        when ctc."call_result"='200004' then 1
                        when ctc."call_result"='200007' then 1
                        when ctc."call_result"='200010' then 1
                        when ctc."call_result"='200011' then 1
                        when ctc."call_result"='200100' then 1
                        when ctc."call_result"='200130' then 1
                        else 0 end),0) as threeNotConnectCount,
                        ifnull(sum(case when ctc.task_id is not null then 0 when ctc."call_result"='200005' then 1 else 0 end),0) as resConnectCount,
                        aab."guid" as "town_code",
                        aab."ad_name" as "town_name",
                        aab."ad_grad" as "town_grad",
                        aab."p_ad_code" as "county_code"
                        from
                        (
                            select ctc."gmt_create",ctc."call_id",ctc."task_id",JSON_VALUE(ctc."call_task_callee_content",'$."$水库编码$"') as waterCode,ctr."call_result",scnfr.task_id from "SJZT_ODS"."call_task_callee" ctc
                            left join SJZT_ODS."call_task" ct on ct."id" = ctc."task_id"
                            left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = ctc."call_id"
                            left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"
                            left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
                            where 1=1
                            and sdct.task_id is null
                            and date_format(ctc."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}
                            and date_format(ctc."gmt_create",'%Y-%m-%d') &lt;= #{callTaskStatistic.endTime}
                        ) ctc
                        left join "SJZT_MD"."att_res_base" arb on ctc.waterCode = arb."code"
                        left join "SJZT_MD"."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
                        where 1=1
                        group by aab."ad_name",aab."guid",aab."ad_grad",aab."p_ad_code"
                    ) a on aab."guid" = a."county_code"
                ) b on aab."guid" = b."city_code"
            ) c
            <if test="callTaskStatistic.grad==1">
                on aab."guid" = c."city_code" or (aab."guid" = c."county_code" and c."county_grad" = 2) or (aab."guid" = c."county_code" and c."county_grad" = 1)
                where 1=1 and aab."ad_grad" = 2
            </if>
            ) ctc
            left join "SJZT_MD"."att_res_base" arb on ctc.waterCode = arb."code"
            left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000') or aab."guid" = arb."interior_ad_guid"
            where 1=1 and aab."ad_name" is not null
            group by DATE_FORMAT(ctc."gmt_create",'%Y-%m-%d'),aab."ad_name",aab."guid",aab."ad_grad",aab."p_ad_code"
        ) a
            group by aab."guid",aab."ad_name"
        ) d on d."guid" = aab."ad_code"
        <if test="callTaskStatistic.grad==1">
            on aab."guid" = a."p_ad_code" where aab."p_ad_code" = #{callTaskStatistic.adCode}
            where aab."ad_grad" =2
        </if>
        <if test="callTaskStatistic.grad==2">
            on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}
        </if>
        <if test="callTaskStatistic.grad==3">
            on aab."guid" = a."guid" where aab."ad_code" = #{callTaskStatistic.adCode}
        </if>
        group by createTime,aab."ad_name",aab."guid"
        order by aab."guid"
    </select>

    <!--按日期行政区呼叫结果详情列表信息-->
    <select id="getCallResultList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
        select
        e.*,
        e."gmt_create" as createTime,e."call_id",e.waterCode,e.callResult,e."callee_number",
        aab."guid",aab."ad_name" as adName,
        bu.real_name as realName,
        if(ifnull(scnfr.call_id,0)='0','','已反馈') isSmsFill,
@@ -605,7 +632,7 @@
                    select "call_id",JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode from "SJZT_ODS"."call_task_callee"
                    ) ctc on ctr."call_id" = ctc."call_id"
                    where 1=1
                    and sdct.time = #{callTaskStatistic.createTime}
                    and sdct.time >= #{callTaskStatistic.startTime} and sdct.time &lt;= #{callTaskStatistic.endTime}
                    ) a group by date_format("gmt_create",'%Y-%m-%d'),waterCode,"callee_number"
                    ) b on ctr."gmt_create" = b."gmt_create" and ctr."callee_number" = b."callee_number"
                    ) d left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = d."call_id"
@@ -632,7 +659,8 @@
                    left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
                    left join "SJZT_MD"."att_res_base" arb on ctc.waterCode = arb."code"
                    left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000')
                    where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
                    where date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}
                    and date_format(ctr."gmt_create",'%Y-%m-%d') &lt;= #{callTaskStatistic.endTime}
                    and sdct.task_id is null
                    <if test="callTaskStatistic.count==2">
                        and ctr."call_result" = '200000' and scnfr.id is not null

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java

@@ -672,6 +672,13 @@
            // 设置当前时间的前一天
            callTaskStatistic.setCreateTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date(l - 60*60*24*1000)));
        }
        if (null==callTaskStatistic.getStartTime() || callTaskStatistic.getStartTime().equals("")){
            long l = System.currentTimeMillis();
            String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date(l - 60 * 60 * 24 * 1000));
            // 设置当前时间的前一天
            callTaskStatistic.setStartTime(format);
            callTaskStatistic.setEndTime(format);
        }
        ThreadPoolExecutor executor = myThreadPoolConfig.threadPoolExecutor();
        callTaskStatistic.setIsPage(1);
        // 异步查询当前天日常呼叫（3次）统计数据

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java

@@ -4,18 +4,18 @@
import cn.gistack.system.user.service.IUserService;
import cn.gistack.system.user.sync.dto.AccountBean;
import cn.gistack.system.user.sync.dto.ApiPushDTO;
import cn.gistack.system.user.sync.exception.ErrorCode;
import cn.gistack.system.user.sync.util.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
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;

import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -40,8 +40,30 @@
    private final static String method = "post";

    @PostMapping("/userpush")
    public R userPush(@RequestBody ApiPushDTO apiPushDTO) {
        System.out.println("请求参数：" + JSON.toJSONString(apiPushDTO));
    public Object userPush(@RequestBody ApiPushDTO apiPushDTO, HttpServletRequest request) {
        Map<String, Object> ret = new HashMap<>();

        String clientId = request.getParameter("clientId");
        String timestamp = request.getParameter("timestamp");
        String sign = request.getParameter("sign");
        String salt = request.getParameter("salt");

        // 校验签名防止篡改参数
        String sign2 = SignBuilder.create(appId, MD5Util.getMD5String(appSecret))
            .requestPath("/api/blade-user/sync/userpush")
            .requestMethod("POST")
            .salt(salt)
            .timestamp(Long.valueOf(timestamp))
            .sign();

        if (!clientId.equals(appId) || !sign.equals(sign2)) {
            ret.put("code", ErrorCode.SIGN_CHECK_ERROR.getCode());
            ret.put("msg", ErrorCode.SIGN_CHECK_ERROR.getMsg());
            ret.put("data", "");
            return ret;
        }

        // 解密syncData
        String syncData = SecurityUtil.decryptAES(apiPushDTO.getSyncData(), MD5Util.getMD5String(appSecret));
        List<AccountBean> accountBeanList = JSONArray.parseArray(syncData, AccountBean.class);

@@ -52,9 +74,9 @@
            params.setPhone(accountBean.getPrincipalId());
            User one = userService.getOne(Condition.getQueryWrapper(params));

            if (one == null){
            if (one == null) {
                //不在，看status状态，若为1则不操作。0添加进库
                if (accountBean.getStatus().equals("0")){
                if (accountBean.getStatus().equals("0")) {

                    User saveUser = new User();
                    //设置id为手机号
@@ -72,9 +94,9 @@
                    saveUser.setTenantId("000000");
                    userService.save(saveUser);
                }
            }else {
            } else {
                //在，看status状态，若为1则删除用户。0更新？
                if (accountBean.getStatus().equals("1")){
                if (accountBean.getStatus().equals("1")) {
                    userService.removeUser(accountBean.getPrincipalId());
                } else { //更新
                    //设置姓名
@@ -83,40 +105,11 @@
                }
            }
        });
        return R.data(apiPushDTO.getTimestamp());
    }

//    public static void main(String[] args) {
//        Map<String,String> attributes = new HashMap<>();
//        // "staffCode": "15563378977",
//        //        "realName": "zhliu",
//        //        "email": null,
//        //        "phone": "15563378977",
//        //        "employeeNum": "zhliu",
//        //        "idCard": null,
//        //        "employeeStatus": "1",
//        //        "userType": "0",
//        //        "sort": "1"
//        attributes.put("staffCode","15563378977");
//        attributes.put("realName","zhliu");
//        attributes.put("email",null);
//        attributes.put("phone","15563378977");
//        attributes.put("employeeNum","zhliu");
//        attributes.put("idCard", null);
//        attributes.put("employeeStatus","1");
//        attributes.put("userType","0");
//        attributes.put("sort","1");
////        String syncData = SecurityUtil.encryptAES(JSON.toJSONString(attributes), MD5Util.getMD5String(appSecret));
////        System.out.println("加密后：" + syncData);
////        String jiemi  = SecurityUtil.decryptAES(syncData, MD5Util.getMD5String(appSecret));
////        System.out.printf("解密后：" + jiemi);
//
//        String tmp = "XmcEvdSFwXYvpAcoDZW5NKYmx1IyvXEJLdRnwLFTBUAhN0DheUZnVMb5y3IuMoASUsBrb82PrbKefa754brKNgvgmKvJxehhkLAWALy/33jX7lA+YjXLzWqLrr/fp6AEVEcLuz8rf+ZvkHcJsyAzPclaxPvd6R0LV0KIiyalnVbhfGCjPPvhYNnOBZh3vNPssn1Z+REywWtHD15G9/zEhpuEno6gPtNxtk1PoqxebCuxZvKRGT2DM/KL0GO4dpY8ksm6bgDcHXcB5oKIdwxb1N7yRQ5DJsIZkz9e/Zo720ObReXCLI9KdErQyOM/uxTqnHE7FVeGP3f5sebTH2WeKyI2mefwGrZYrnGAfxbZOr8pDpXiDs/SF35SHdvC5rRAgfEMm9r1pA74xtb9vplcmvQQqB7aDMbRLQWOo3R9U4KqwU2yvq1L6pZLeWbFVKH5ei40APzcdGS3K8QpcfyzkU5BuR4VgHvNMS9xEkIAbZ9flLBEPE08CReEQ9rJQr8AP5SZ4d394aIxJnJHRxwCNUuMMEdj0/C8UDfwwQMxUQPDlc4tA+DHDjgAwc641gu8IVTqmWjb5+kT3v0Xe9pEPgg4C9kDn0JOoZxsG0UpHdWU5QObGhI+i/j9Ip1T2pcvJdy0eAU0HSAtfBu56i/Li9L97jqtWSog05H3ni3mLjbFrDBARfEd4mOSW9F89fya7ORMM/SnW0qD+Db9dS8Uu/eKdpct/xm4i74HbknnUEdr85txKh0QSNahkirT88yot4YJTPNKOMRQQKrLgj5nAopZIqaoOHvHaTNR6ii0Se8TLrUeUwEYdoW/dpB/3ql5nt34igYLSdll7jw3jRHTHZ6oqvd7CGyQvqSdimcq/BCitx2TkorxMDvoawjYm++eCjW6CDHC2gl4P4e8yf2R5yIjEMxBlU7daMZAcGjY2IO0/WXmW0lbpBXwydHiSSW3oTEL/pwGEFszW2mocMmyB5V2jce8xt4Kog2s1hjNuISZ7J5QIWph0SXONELyCpMud1wFxWpj6o1nZGSV/yzZhTfgk+yEItgRYlDnAEew8lTKSTaOX97/G2Xc1fJZFYYzOuVhtzakrJ3LUjxYEOKr5+NkEx0utKt3UV7o5oH7RB2lvpjREZ5vnvZDIDAWpBnH0thYaq2s2a7KJj92gbgWAjbyFVK2RIOREs3Lw0SxWUh2hfwCPNj7oXzS+X7vwmf4R3aw2vfI20sLKbhyezGKFgmtHQkn1lvdbMDj7hNfNXG6UE698Fa6Fq2Vr7DhPdlAZVmrHiPPaRSKi6QlOaeNtGe8J3PrJpYbtlDV/e8+DRA0kAcrofhktiOFjQcOMY0Gu3qJt6tV4L1ODndZCHdmWIytMsyAB+tEoeEFhIMpWZAzosCws+Kx78L/Uy7t/LwDP+vlN5RoFQnjeAdZTMtriNDmG+8KqrOWOz4EM5uMICro7bbuMBxpAZkV348dlUoQZkzd8jog0f2NkAygL+qIWeQtcOrjYU5S00q9LVd2swK1szpOIaRFbq8YIWLKaEWhPDZIJmtYYhlKIHJ3D0bJ0HoiENjSLyYYEEVmQF4j9wmIBvcyIr46NDF47Jo9K8hVNJObc41qecxh2kiqNh3lST50rgdma5uOJH1dsnS4gYCYWM6jY/8JMLEoqhTO//ljcI9XpnvzSN3F1jkhCJtV7yhBN20wczEdSB63VFxwQU5C5MEbfiLs0kXhgogXQ4e9";
//        String jiemi2  = SecurityUtil.decryptAES(tmp, MD5Util.getMD5String(appSecret));
//        System.out.printf("解密后：" + jiemi2);
//
//        SignUtil.getSign(appId, 1L, appSecret, "", "post", attributes);
//
//    }
        ret.put("code", 1000);
        ret.put("msg", "成功");
        ret.put("data", apiPushDTO.getSign());
        return ret;
    }

}