Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

zhaozhengjie

2022-09-28 ca7d4ca1b26fd6a1886e5bb276230d1489e21dd6

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/.idea/compiler.xml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.sanshuo;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -138,6 +139,7 @@
    private Long createBy;
    /**创建时间*/
    @ApiModelProperty(name = "createAt", value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createAt;
    /**修改人*/
    @ApiModelProperty(name = "updateBy", value = "修改人")

 springcloud_k8s_panzhihuazhihuishequ/grid_app/grid_app.iml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/grid_backstage.iml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/ComSanShuoEventController.java

@@ -245,4 +245,5 @@
    }



}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/CommonApi.java

@@ -78,7 +78,7 @@
        String fileExtension = ".jpg";

        String originName = file.getOriginalFilename();
        AtomicBoolean isVideo = new AtomicBoolean(false);
            AtomicBoolean isVideo = new AtomicBoolean(false);
        videoExtensionAllow.forEach(ext -> {
            String originNameLowerCase = originName.toLowerCase();
            if (originNameLowerCase.endsWith("." + ext)) {
@@ -88,15 +88,12 @@
        if (isVideo.get()) {
            fileExtension = ".mp4";
        }

        if (originName.toLowerCase().endsWith(".mp3")) {
            fileExtension = ".mp3";
        }

        if (originName.toLowerCase().endsWith(".gif")) {
            fileExtension = ".gif";
        }

        String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
        File file1 = new File(fileName);

@@ -119,6 +116,7 @@

    }


    @ApiOperation(value = "新上传照片接口")
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {

 springcloud_k8s_panzhihuazhihuishequ/service_api/service_api.iml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java

@@ -8,10 +8,12 @@
import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoEventDTO;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.entity.ComMediateType;
import com.panzhihua.service_community.entity.ComSanshuoEvent;
import com.panzhihua.service_community.service.ComSanShuoEventService;
import com.panzhihua.service_community.service.CommediateTypeService;
import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +34,9 @@

    @Resource
    private CommediateTypeService commediateTypeService;

    @Resource
    private IComEventService comEventService;

    @GetMapping ("/list")
    public R list(@RequestParam(value = "keyWord",required = false)String keyWord,
@@ -79,7 +84,14 @@
        comMediateType.setDeleteFlag(true);
        comMediateType.setEnabled(false);
        comMediateType.setModifyUser(this.getLoginUserInfo().getUserId());
        //该分类是否有未调解完成事件
        List<ComEvent> list = comEventService.list(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getEventCategory, id).in(ComEvent::getEventProcessStatus, (1), (2), (5)));
        if (list.size() != 0){
            return R.fail("有未处理完成事件,无法删除");
        }
        return R.ok(commediateTypeService.updateById(comMediateType));
    }



}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -284,7 +284,7 @@
        ComSanshuoExpert specter = comSanShuoExpertService.getById(specterId);
        comEvent.setSpecialistAcceptTime(new Date());
        comEvent.setSpecialistName(specter.getName());
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode());
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.conciliation.getCode());
        int flag = baseMapper.updateById(comEvent);
        return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/service_grid.iml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_property/service_property.iml

File was deleted