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

guoshilong

2023-07-06 390eb925034c3f6dea83fc7ce2378ea40a93053d

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

# Conflicts:
#	data/applogs/xxl-job/xxl-job-admin.log

 data/applogs/xxl-job/xxl-job-admin.log

File was deleted

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java

@@ -292,9 +292,9 @@
            list.add(jszrr);
        }else {
            // 巡查责任人姓名
            list.add("");
            list.add("-");
            // 技术责任人姓名
            list.add("");
            list.add("-");
        }
    }

@@ -315,7 +315,7 @@
            // 拼接水利部人员信息
            list.add(builder.substring(0,builder.length()-1));
        }else {
            list.add(" ");
            list.add("-");
        }
    }

@@ -329,12 +329,12 @@
        // 查询巡查责任人姓名，技术责任人姓名信息
        List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(0),personTypes);
        if (personVOList.size()>0) {
            String xzzrr = " ";
            String zgzrr = " ";
            String jszrr = " ";
            String xczrr = " ";
            String xzzrr = "-";
            String zgzrr = "-";
            String jszrr = "-";
            String xczrr = "-";
            for (PersonVO personVO : personVOList) {
                String str = null!=personVO.getPhone() ? ":"+personVO.getPhone():"";
                String str = null!=personVO.getPhone() ? ":"+personVO.getPhone():"-";
                if (personVO.getType().equals(split[0])) {
                    xzzrr = personVO.getName() + str;
                }
@@ -358,7 +358,7 @@
            list.add(xczrr);
        }else {
            for (String type : split) {
                list.add(" ");
                list.add("-");
            }
        }
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java

@@ -237,6 +237,7 @@

        }

        // 拼接条件有问题，不操作
        if (sqlStr.indexOf("-1") > 0) {
            return R.fail(-1,sqlStr + "\\n 查询条件错误，请检查规则设置");
        }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml

@@ -31,6 +31,7 @@
        WHERE a."user_phone" = b.PHONE
          and a."res_guid" = c."guid"
          and a."type" = 5
          and c."interior_ad_guid" like '421303%'
    </select>

    <update id="updateResManagePersonByGuid">
@@ -182,6 +183,7 @@
        where bu.is_deleted = 0
        and br.role_alias = #{roleAlias}
        and bd.ad_code = #{adCode}
        limit 3
    </select>

</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java

@@ -4,6 +4,7 @@
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.gistack.alerts.sms.feign.ISmsRecordClient;
import cn.gistack.sm.sms.service.AsyncSmsService;
import cn.gistack.sm.sms.util.SmsUtils;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
@@ -34,7 +35,9 @@

    private final IUserClient userClient;

    private final ISmsRecordClient smsRecordClient;


    private final AsyncSmsService asyncSmsService;

    /**
     * 发送登录验证码
@@ -59,8 +62,7 @@
            // 保存验证码到 redis
            saveCodeForRedis(request.getUserNumber(), randNumber);
            // 记录发送记录操作
            smsRecordClient.saveSmsRecord(
                request.getUserNumber(),
            asyncSmsService.saveSmsRecord(request.getUserNumber(),
                request.getMessageContent(),
                request.getTemplateId(),
                resultComResult.getCode().toString(),

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/AsyncSmsService.java

New file
@@ -0,0 +1,28 @@
package cn.gistack.sm.sms.service;

import cn.gistack.alerts.sms.feign.ISmsRecordClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;

@Component
public class AsyncSmsService {

    @Autowired
    private ISmsRecordClient smsRecordClient;


    /**
     * 异步记录发送记录操作
     * @param userNumber
     * @param messageContent
     * @param templateId
     * @param code
     * @param msg
     * @param number
     */
    @Async
    public void saveSmsRecord(String userNumber, String messageContent, String templateId, String code, String msg, int number) {
        smsRecordClient.saveSmsRecord(userNumber,messageContent,templateId,code,msg,number);
    }
}