Merge branch 'test' into test-dsc

* test:
  把-server项目改为jar包,新增 server-app项目作为启动器 http://172.16.46.63:31560/index.php?m=task&f=view&taskID=699
  [+]增加国密SM4加解密工具包
  fix(user-dept): 修改用户来源筛选条件
  fix(databus): 修复部门数据查询中缺少数据源过滤条件
  fix(databus): 修改用户同步的数据源过滤条件
  fix(databus): 修改用户同步的数据源过滤条件
  [+]增加国密SM4接口加解密
  [#]修改部门推送消息逻辑

# Conflicts:
#	zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/security/CryptoSignatureUtils.java
#	zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusDeptProviderApiImpl.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/SmsCallbackController.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/SystemServerApplication.java

@@ -1,30 +0,0 @@
-package com.zt.plat.module.system;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * 项目的启动类
- *
- * 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
- * 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
- * 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
- *
- * @author ZT
- */
-@SpringBootApplication
-public class SystemServerApplication {
-
-    public static void main(String[] args) {
-        // 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
-        // 如果你碰到 启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
-        // 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
-
-        SpringApplication.run(SystemServerApplication.class, args);
-
-        // 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
-        // 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
-        // 如果你碰到启动的问题，请认真阅读 http://172.16.46.63:30888/quick-start/ 文章
-    }
-
-}

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.bind.annotation.*;
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 短信回调")
@@ -73,4 +74,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);
+    }
+
 }