rk
2 天以前 2deac0844f4a49455129dfa8e3a76e1c509f094d
钥匙柜信息处理
已修改5个文件
55 ■■■■■ 文件已修改
server/system_service/src/main/java/com/doumee/core/utils/Constants.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -107,6 +107,7 @@
    // 访客来访配置
    public static final String VISIT_CONFIG = "VISIT_CONFIG";
    public static final String MEMBER_IMG = "MEMBER_IMG";
    public static final String ACTIVATE = "ACTIVATE";
    public static final String PLATFORM_EVENT_IMG = "PLATFORM_EVENT_IMG";
    public static final String VISIT_NOTICE = "VISIT_NOTICE";
    public static final String TIME_OUT_CONFIG = "TIME_OUT_CONFIG";
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
@@ -63,8 +63,8 @@
    @ExcelColumn(name="类型0图片 1视频 2其他")
    private Integer type;
    @ApiModelProperty(value = "关联对象类型 0隐患现场情况 1隐患处理前情况 2隐患处理后情况 3隐患退回说明 4会议室文件", example = "1")
    @ExcelColumn(name="关联对象类型 0隐患现场情况 1隐患处理前情况 2隐患处理后情况 3隐患退回说明 4会议室文件")
    @ApiModelProperty(value = "关联对象类型 0隐患现场情况 1隐患处理前情况 2隐患处理后情况 3隐患退回说明 4会议室文件 5钥匙柜激活文件", example = "1")
    @ExcelColumn(name="关联对象类型 0隐患现场情况 1隐患处理前情况 2隐患处理后情况 3隐患退回说明 4会议室文件 5钥匙柜激活文件")
    private Integer objType;
    @ApiModelProperty(value = "文件地址")
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: test
    active: dev
  application:
    name: visitsAdmin
    # 安全配置
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.system.model.Multifile;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -163,5 +164,8 @@
    @TableField(exist = false)
    private List<String> authMemberIdList;
    @ApiModelProperty(value = "激活文件")
    @TableField(exist = false)
    private Multifile activateFile;
}
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -12,6 +12,8 @@
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
@@ -46,6 +48,9 @@
    @Autowired
    private JkCabinetMapper jkCabinetMapper;
    @Autowired
    private MultifileMapper multifileMapper;
    @Autowired
    private CategoryMapper categoryMapper;
@@ -112,6 +117,18 @@
        jkCabinet.setManagerId(String.join(",",jkCabinet.getManagerIdList()));
        jkCabinet.setAuthMemberId(String.join(",",jkCabinet.getAuthMemberIdList()));
        jkCabinetMapper.insert(jkCabinet);
        if(Objects.nonNull(jkCabinet.getActivateFile())){
            Multifile multifile = jkCabinet.getActivateFile();
            multifile.setCreateDate(new Date());
            multifile.setEditDate(multifile.getCreateDate());
            multifile.setIsdeleted(Constants.ZERO);
            multifile.setObjId(jkCabinet.getId());
            multifile.setObjType(Constants.FIVE);
            multifileMapper.insert(multifile);
        }
        this.createGrid(jkCabinet);
        return jkCabinet.getId();
    }
@@ -224,6 +241,21 @@
        jkCabinet.setManagerId(String.join(",",jkCabinet.getManagerIdList()));
        jkCabinet.setAuthMemberId(String.join(",",jkCabinet.getAuthMemberIdList()));
        jkCabinetMapper.updateById(jkCabinet);
        multifileMapper.update(new UpdateWrapper<Multifile>().lambda()
                .set(Multifile::getIsdeleted,Constants.ONE)
                .eq(Multifile::getObjType,Constants.FIVE)
                .eq(Multifile::getObjId,jkCabinet.getId())
        );
        if(Objects.nonNull(jkCabinet.getActivateFile())){
            Multifile multifile = jkCabinet.getActivateFile();
            multifile.setId(null);
            multifile.setCreateDate(new Date());
            multifile.setEditDate(multifile.getCreateDate());
            multifile.setIsdeleted(Constants.ZERO);
            multifile.setObjId(jkCabinet.getId());
            multifile.setObjType(Constants.FIVE);
            multifileMapper.insert(multifile);
        }
    }
    @Override
@@ -274,6 +306,18 @@
                    jkCabinet.getAuthMemberId().split(",")
            ));
        }
        Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>()
                .lambda()
                .eq(Multifile::getObjType,Constants.FIVE)
                .eq(Multifile::getObjId,jkCabinet.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .last(" limit 1 "));
        if(Objects.nonNull(multifile)){
            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.ACTIVATE).getCode();
            multifile.setFileurlFull(prefixUrl + multifile.getFileurl());
            jkCabinet.setActivateFile(multifile);
        }
        return jkCabinet;
    }