Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test

* 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud:
  [+]增加国密SM4加解密工具包
  [+]增加国密SM4接口加解密
  [#]修改部门推送消息逻辑

zt-module-system/zt-module-system-server/pom.xml

@@ -191,6 +191,13 @@
             <artifactId>zt-spring-boot-starter-mq</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.13.1</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
 

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/esp/EspApiImpl.java

@@ -2,15 +2,17 @@ package com.zt.plat.module.system.api.esp;
 
 import com.zt.plat.framework.common.exception.enums.GlobalErrorCodeConstants;
 import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.util.object.ObjectUtils;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.system.api.dept.dto.DeptMsgRespDTO;
 import com.zt.plat.module.system.api.dept.dto.DeptSaveReqDTO;
-import com.zt.plat.module.system.api.esp.dto.EspDto;
+import com.zt.plat.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
 import com.zt.plat.module.system.service.dept.IEspService;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Objects;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @RestController
 @Validated
@@ -18,16 +20,26 @@ public class EspApiImpl implements EspApi {
 
 
     @Resource
-    private IEspService deptService;
+    private IEspService espService;
+
+
     @Override
-    public CommonResult<List<EspDto>> pushMsg(DeptSaveReqDTO syncReqDTO)
+    public CommonResult<Long> createDept(DeptSaveReqDTO createReqVO) {
+        DeptSaveReqVO reqVO = BeanUtils.toBean(createReqVO, DeptSaveReqVO.class);
+        Long deptId = espService.createDept(reqVO);
+        return success(deptId);
+    }
+
+
+    @Override
+    public CommonResult<List<DeptMsgRespDTO>> selectDepMsg(DeptSaveReqDTO syncReqDTO)
     {
         if(Objects.isNull(syncReqDTO) || null == syncReqDTO.getId())
         {
             return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),
                     "ID不能为空");
         }
-        return CommonResult.success(deptService.pushMsg(syncReqDTO));
+        return espService.selectDepMsg(syncReqDTO);
     }
 
 }

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/msg/MsgSendApiImpl.java

@@ -0,0 +1,84 @@
+package com.zt.plat.module.system.api.msg;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.system.api.sms.dto.log.SmsLogRespDTO;
+import com.zt.plat.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
+import com.zt.plat.module.system.service.sms.SmsLogService;
+import com.zt.plat.module.system.service.sms.SmsSendService;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+@RestController
+@Validated
+public class MsgSendApiImpl implements MsgSendApi {
+
+    @Resource
+    private SmsSendService smsSendService;
+    @Resource
+    private SmsLogService smsLogService;
+
+
+    @Override
+    public CommonResult<Long> sendTextMsg(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<Long> sendImageMsg(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<SmsLogRespDTO> getSmsLog(Long id) {
+        return success(BeanUtils.toBean(smsLogService.getSmsLog(id), SmsLogRespDTO.class));
+    }
+
+    @Override
+    public CommonResult<Long> sendVideoMsg(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<Long> sendFileMsg(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<SmsLogRespDTO> sendTextCardMsg(Long id) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<Long> sendTextCardMsgPich01(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<Long> sendNewsMsg(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<SmsLogRespDTO> sendMpNewsMsg(Long id) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<Long> sendMarkdownMsg(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<Long> sendMiniProgramNoticeMsg(SmsSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public CommonResult<SmsLogRespDTO> sendInteractiveTaskCardMsg(Long id) {
+        return null;
+    }
+
+}

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/MsgCallBackController.java

@@ -0,0 +1,18 @@
+package com.zt.plat.module.system.controller.admin.sms;
+
+import com.zt.plat.module.system.service.sms.SmsSendService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "管理后台 - 消息回调")
+@RestController
+@RequestMapping("/system/sms/callback")
+public class MsgCallBackController {
+
+
+    @Resource
+    private SmsSendService smsSendService;
+
+}

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/SmsCallbackController.java

@@ -8,11 +8,9 @@ import com.zt.plat.module.system.service.sms.SmsSendService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
-
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
 import jakarta.servlet.http.HttpServletRequest;
-
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 短信回调")
@@ -71,4 +69,13 @@ public class SmsCallbackController {
         return success(true);
     }
 
+    @PostMapping("/zle")
+    @PermitAll
+    @TenantIgnore
+    @Operation(summary = "中铝e办短信的回调")
+    public CommonResult<Boolean> receiveZleSmsStatus(@RequestBody String requestBody) throws Throwable {
+        smsSendService.receiveSmsStatus(SmsChannelEnum.ZLE.getCode(), requestBody);
+        return success(true);
+    }
+
 }

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/SmsTemplateController.java

@@ -6,11 +6,10 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-import com.zt.plat.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO;
-import com.zt.plat.module.system.controller.admin.sms.vo.template.SmsTemplateRespVO;
-import com.zt.plat.module.system.controller.admin.sms.vo.template.SmsTemplateSaveReqVO;
-import com.zt.plat.module.system.controller.admin.sms.vo.template.SmsTemplateSendReqVO;
+import com.zt.plat.module.system.controller.admin.sms.vo.msg.TextMessage;
+import com.zt.plat.module.system.controller.admin.sms.vo.template.*;
 import com.zt.plat.module.system.dal.dataobject.sms.SmsTemplateDO;
+import com.zt.plat.module.system.service.msg.ISendMsgService;
 import com.zt.plat.module.system.service.sms.SmsSendService;
 import com.zt.plat.module.system.service.sms.SmsTemplateService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -19,13 +18,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
 import java.io.IOException;
 import java.util.List;
-
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.zt.plat.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 短信模板")
@@ -37,6 +36,8 @@ public class SmsTemplateController {
     private SmsTemplateService smsTemplateService;
     @Resource
     private SmsSendService smsSendService;
+    @Resource
+    private ISendMsgService sendMsgService;
 
     @PostMapping("/create")
     @Operation(summary = "创建短信模板")
@@ -100,4 +101,18 @@ public class SmsTemplateController {
                 sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
     }
 
+    @PostMapping("/send-msg")
+    @Operation(summary = "发送消息")
+    @PreAuthorize("@ss.hasPermission('system:sms-template:send-msg')")
+    public CommonResult<Object> sendMsg(@Valid @RequestBody MsgTemplateSendReqVO sendReqVO,TextMessage textMessage) throws Exception{
+
+        String msgtype = textMessage.getMsgtype();
+        if (StringUtils.isBlank(msgtype)){
+            return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数缺失:%s",msgtype));
+        }
+        //发送消息到MQ
+        CommonResult<Object> objectCommonResult = sendMsgService.sendTextMsg(sendReqVO,textMessage);
+        return success(objectCommonResult);
+    }
+
 }

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/vo/msg/BaseMessage.java

@@ -0,0 +1,48 @@
+package com.zt.plat.module.system.controller.admin.sms.vo.msg;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+
+/**
+ * 企业微信消息发送对象父类
+ *
+ * @author dongqiang.hao
+ */
+@Data
+@Accessors(chain = true)
+public class BaseMessage implements Serializable {
+
+    /**
+     * 指定接收消息的成员，成员ID列表（多个接收者用‘|’分隔，最多支持1000个）。特殊情况：指定为”@all”，则向该企业应用的全部成员发送
+     */
+    private String touser;
+    /**
+     * 指定接收消息的部门，部门ID列表，多个接收者用‘|’分隔，最多支持100个。当touser为”@all”时忽略本参数
+     */
+    private String toparty;
+    /**
+     * 指定接收消息的标签，标签ID列表，多个接收者用‘|’分隔，最多支持100个。当touser为”@all”时忽略本参数
+     */
+    private String totag;
+    /**
+     * 企业应用的id，整型。企业内部开发，可在应用的设置页面查看；第三方服务商，可通过接口 获取企业授权信息 获取该参数值
+     */
+    private String agentid;
+    /**
+     * 消息类型
+     */
+    private String msgtype;
+    /**
+     * 发送消息的自建应用类型
+     */
+    private String appType;
+    /**
+     * 表示是否开启重复消息检查，0表示否，1表示是，默认0
+     */
+    private Integer enable_duplicate_check = 0;
+    /**
+     * 表示是否重复消息检查的时间间隔，默认1800s，最大不超过4小时
+     */
+    private Integer duplicate_check_interval;
+}

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/vo/msg/Btn.java

@@ -0,0 +1,34 @@
+package com.zt.plat.module.system.controller.admin.sms.vo.msg;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 任务卡片消息按钮对象
+ *
+ * @author luzemin
+ */
+@Data
+public class Btn implements Serializable {
+
+    /**
+     * 按钮key值，用户点击后，会产生任务卡片回调事件，回调事件会带上该key值，只能由数字、字母和“_-@”组成，最长支持128字节
+     */
+    private String key;
+
+    /**
+     * 按钮名称，最长支持18个字节，超过则截断
+     */
+    private String name;
+
+    /**
+     * 按钮字体颜色，可选“red”或者“blue”,默认为“blue”
+     */
+    private String color;
+
+    /**
+     * 按钮字体是否加粗，默认false
+     */
+    private Boolean is_bold;
+
+}

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/vo/msg/ContentItem.java

@@ -0,0 +1,22 @@
+package com.zt.plat.module.system.controller.admin.sms.vo.msg;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 小程序通知消息内容元素对象
+ *
+ * @author luzemin
+ */
+@Data
+public class ContentItem implements Serializable {
+    /**
+     * 元素对象键值,长度10个汉字以内
+     */
+    private String key;
+    /**
+     * 元素对象值,长度30个汉字以内（支持id转译）
+     */
+    private String value;
+}

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/vo/msg/FileMessage.java

@@ -0,0 +1,30 @@
+package com.zt.plat.module.system.controller.admin.sms.vo.msg;
+
+import com.zt.plat.module.system.framework.sms.core.enums.WxMsgTypeConstant;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+ * 企业微信文件消息发送对象
+ *
+ * @author luzemin
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class FileMessage extends BaseMessage {
+    /**
+     * 消息类型，此时固定为：file
+     */
+    private final String msgtype = WxMsgTypeConstant.FILE.getCode();
+
+    /**
+     * 企业微信文件消息体对象
+     */
+    private Media file = new Media();
+
+    /**
+     * 表示是否是保密消息，0表示可对外分享，1表示不能分享且内容显示水印，默认为0
+     */
+    private Integer safe = 0;
+}