From 9772cfdb668bdb19b2fe342978d9b37ddbdb9558 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 17 十一月 2022 17:40:43 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java | 4 ++--
ycl-platform/src/main/resources/mapper/message/MessageMapper.xml | 2 +-
ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml | 2 +-
ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml | 2 +-
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 2 +-
ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java | 2 +-
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 12 +++++-------
ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java | 4 ++--
8 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
index 66fecba..460ef77 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
@@ -92,7 +92,7 @@
}
@ApiOperation("鎵归噺鍒犻櫎娑堟伅")
- @RequestMapping(value = "/delete", method = RequestMethod.POST)
+ @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@ResponseBody
@LogSave(operationType = "娑堟伅绠＄悊", contain = "鍒犻櫎娑堟伅")
public CommonResult delete(@RequestParam("ids") List<Long> ids) {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java b/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java
index f3ac7f7..833bfca 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java
@@ -143,7 +143,7 @@
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
- @ExcelProperty(value = "鍒涘缓鏃堕棿", index = 11)
+ @ExcelIgnore
private LocalDateTime createTime;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 49e5b57..7208238 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -1,9 +1,6 @@
package com.ycl.service.message.impl;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.net.url.UrlPath;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -13,7 +10,6 @@
import com.ycl.entity.message.Message;
import com.ycl.entity.message.SendReq;
import com.ycl.entity.message.SendRes;
-import com.ycl.entity.user.UmsAdmin;
import com.ycl.exception.ApiException;
import com.ycl.mapper.message.MessageMapper;
import com.ycl.mapper.user.UmsAdminMapper;
@@ -87,8 +83,8 @@
Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
.eq(Message::getTargetTo, message.getTargetTo())
.eq(Message::getTargetFrom, message.getTargetFrom())
- .eq(Message::getBody,message.getBody())
- .eq(Message::getHead,message.getHead()));
+ .eq(Message::getBody, message.getBody())
+ .eq(Message::getHead, message.getHead()));
if (savedMessage != null) {
messageMapper.deleteById(savedMessage);
}
@@ -113,6 +109,8 @@
//鐭俊鍙戦��
case ChannelCode.MAIL:
sendMail(message);
+ break;
+ case ChannelCode.INNER:
break;
default:
throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
@@ -200,7 +198,7 @@
@Override
public Page<MessageVO> list(MessageParam messageParam) {
Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
- return messageMapper.selectMessagePage(page,messageParam);
+ return messageMapper.selectMessagePage(page, messageParam);
}
@Override
diff --git a/ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java b/ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java
index 756f7eb..1b55c2a 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java
@@ -20,8 +20,8 @@
@ApiModelProperty(name = "id")
private Integer id;
- @ApiModelProperty(name = "妗堜欢id")
- private Long baseId;
+ @ApiModelProperty(name = "妗堜欢缂栧彿")
+ private String code;
@ApiModelProperty(name = "绀惧尯")
private String regionName;
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
index c0962e3..94cf1ad 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
@@ -69,7 +69,7 @@
and t1.status=#{messageParam.status}
</if>
<if test="messageParam.respondResult !=null and messageParam.respondResult !='' ">
- and t1.respond_result={messageParam.respondResult}
+ and t1.respond_result=#{messageParam.respondResult}
</if>
<if test="messageParam.sort==1">
ORDER BY t1.create_time desc
diff --git a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
index 8eba162..bbd6238 100644
--- a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
@@ -21,7 +21,7 @@
SELECT
t2.category,
t2.event_source,
- t2.id as baseId,
+ t2.code as code,
t1.id,
t3.region_name,
t1.create_time,
diff --git a/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
index 71aa120..8ef51ba 100644
--- a/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
@@ -21,7 +21,7 @@
SELECT
t2.category,
t2.event_source,
- t2.id as baseId,
+ t2.code as code,
t1.id,
t3.region_name,
t1.create_time,
diff --git a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
index 1446fd1..ade2e9c 100644
--- a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
+++ b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
@@ -3,6 +3,7 @@
import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.enums.common.DictTypeEnum;
import com.ycl.service.caseHandler.IBaseCaseService;
+import com.ycl.utils.MD5Util;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -37,8 +38,7 @@
void createCode() {
// LocalDateTime parse = LocalDateTime.parse("2017-02-02 08:59:12", DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"));
LocalDateTime ldt = LocalDateTime.parse("2017-02-02 08:44:12", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- System.out.println(ldt);
-
+ System.out.println( MD5Util.md5Encrypt32Lower("123456"));
}
@Test
--
Gitblit v1.8.0