Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-11-17 9772cfdb668bdb19b2fe342978d9b37ddbdb9558

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

 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) {

 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;

    /**

 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;
@@ -114,6 +110,8 @@
            case ChannelCode.MAIL:
                sendMail(message);
                break;
            case ChannelCode.INNER:
                break;
            default:
                throw new ApiException("未匹配到该类型");
        }

 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;

 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

 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,

 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,

 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