diff --git a/vetti-admin/src/main/java/com/vetti/web/service/impl/CommonServiceImpl.java b/vetti-admin/src/main/java/com/vetti/web/service/impl/CommonServiceImpl.java index 7ad6518..f51a599 100644 --- a/vetti-admin/src/main/java/com/vetti/web/service/impl/CommonServiceImpl.java +++ b/vetti-admin/src/main/java/com/vetti/web/service/impl/CommonServiceImpl.java @@ -13,6 +13,7 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.time.Duration; +import java.util.HashMap; import java.util.Map; /** * 共同 信息 服务实现类 @@ -24,13 +25,21 @@ import java.util.Map; @Service public class CommonServiceImpl implements ICommonService { - // OpenAI API密钥，需要替换为你自己的密钥 - @Value("${chatGpt.apiKey}") - private String apiKey; - // API端点URL - @Value("${chatGpt.apiClientTokenUrl}") + @Value("${whisper.apiClientTokenUrl}") private String apiClientTokenUrl; + @Value("${whisper.model}") + private String MODEL; + + @Value("${whisper.apiKey}") + private String apiKey; + + @Value("${whisper.language}") + private String language; + + @Value("${whisper.prompt}") + private String prompt; + /** * 获取openAi客户端临时Key * @return @@ -46,8 +55,13 @@ public class CommonServiceImpl implements ICommonService { .build(); // 2. 构建请求体（空 JSON 对象） - ObjectMapper objectMapper = new ObjectMapper(); - String requestBody = ""; + Map params = new HashMap<>(); + Map bodyEntity = new HashMap<>(); + bodyEntity.put("model",MODEL); + bodyEntity.put("prompt",prompt); + bodyEntity.put("language",language); + params.put("input_audio_transcription",bodyEntity); + String requestBody = JSONUtil.toJsonStr(params); // 3. 构建 HTTP 请求 HttpRequest request = HttpRequest.newBuilder() .uri(URI.create(apiClientTokenUrl)) @@ -65,8 +79,11 @@ public class CommonServiceImpl implements ICommonService { // 解析响应为实体类 System.out.println(JSONUtil.toJsonStr(response.body())); Map entity = JSONUtil.toBean(response.body(), Map.class); - dto.setClientSecret(entity.get("id").toString()); -// dto.setExpiresAt(Long.valueOf(entity.get("expires_at").toString())); + if(entity.get("client_secret") != null) { + Map data = (Map) entity.get("client_secret"); + dto.setClientSecret(data.get("value").toString()); + dto.setExpiresAt(Long.valueOf(data.get("expires_at").toString())); + } } } catch (Exception e) { e.printStackTrace(); diff --git a/vetti-admin/src/main/resources/application-dev.yml b/vetti-admin/src/main/resources/application-dev.yml index 477e3ed..2c0cd20 100644 --- a/vetti-admin/src/main/resources/application-dev.yml +++ b/vetti-admin/src/main/resources/application-dev.yml @@ -154,7 +154,10 @@ whisper: apiUrl: https://api.openai.com/v1/audio/transcriptions model: whisper-1 apiKey: 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 - language: zh + language: en + apiClientTokenUrl: https://api.openai.com/v1/realtime/sessions + prompt: This is a clear conversation in English. The user is speaking naturally through their device microphone. Please transcribe accurately with proper punctuation and natural speech patterns. + # AI 聊天 chatGpt: diff --git a/vetti-admin/src/main/resources/application-druid.yml b/vetti-admin/src/main/resources/application-druid.yml index ebe2b1f..6d4d646 100644 --- a/vetti-admin/src/main/resources/application-druid.yml +++ b/vetti-admin/src/main/resources/application-druid.yml @@ -159,9 +159,11 @@ elevenLabs: # 语音转文本 whisper: apiUrl: https://api.openai.com/v1/audio/transcriptions - model: gpt-4o-mini-transcribe + model: whisper-1 apiKey: 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 language: en + apiClientTokenUrl: https://api.openai.com/v1/realtime/sessions + prompt: This is a clear conversation in English. The user is speaking naturally through their device microphone. Please transcribe accurately with proper punctuation and natural speech patterns. # AI 聊天 chatGpt: @@ -169,7 +171,7 @@ chatGpt: apiUrl: https://api.openai.com/v1/chat/completions model: ft:gpt-3.5-turbo-0125:vetti:construction-labourer-test:CWKBNvE2 role: system - apiClientTokenUrl: https://api.openai.com/v1/realtime/sessions + http: diff --git a/vetti-admin/target/classes/application-druid.yml b/vetti-admin/target/classes/application-druid.yml index ebe2b1f..6d4d646 100644 --- a/vetti-admin/target/classes/application-druid.yml +++ b/vetti-admin/target/classes/application-druid.yml @@ -159,9 +159,11 @@ elevenLabs: # 语音转文本 whisper: apiUrl: https://api.openai.com/v1/audio/transcriptions - model: gpt-4o-mini-transcribe + model: whisper-1 apiKey: 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 language: en + apiClientTokenUrl: https://api.openai.com/v1/realtime/sessions + prompt: This is a clear conversation in English. The user is speaking naturally through their device microphone. Please transcribe accurately with proper punctuation and natural speech patterns. # AI 聊天 chatGpt: @@ -169,7 +171,7 @@ chatGpt: apiUrl: https://api.openai.com/v1/chat/completions model: ft:gpt-3.5-turbo-0125:vetti:construction-labourer-test:CWKBNvE2 role: system - apiClientTokenUrl: https://api.openai.com/v1/realtime/sessions + http: diff --git a/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java b/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java index eedce8e..cefe0bb 100644 --- a/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java +++ b/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java @@ -121,6 +121,12 @@ public class SysUser extends BaseEntity @ApiModelProperty("个人展示的链接地址") private List bestSideDtoList; + @ApiModelProperty("用户地址") + private String address; + + @ApiModelProperty("用户标识(1:新用户,2:老用户)") + private String userFlag; + /** 部门对象 */ @Excels({ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @@ -440,6 +446,22 @@ public class SysUser extends BaseEntity this.bestSideDtoList = bestSideDtoList; } + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getUserFlag() { + return userFlag; + } + + public void setUserFlag(String userFlag) { + this.userFlag = userFlag; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/vetti-common/src/main/java/com/vetti/common/enums/UserFlagEnum.java b/vetti-common/src/main/java/com/vetti/common/enums/UserFlagEnum.java new file mode 100644 index 0000000..2606372 --- /dev/null +++ b/vetti-common/src/main/java/com/vetti/common/enums/UserFlagEnum.java @@ -0,0 +1,30 @@ +package com.vetti.common.enums; + +/** + * 用户标识 + */ +public enum UserFlagEnum { + + FLAG_1("1", "新用户"), + FLAG_2("2", "老用户"), + ; + + private final String code; + private final String info; + + UserFlagEnum(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } +} diff --git a/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java b/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java index 3131d08..8361ea0 100644 --- a/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java +++ b/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java @@ -1,6 +1,7 @@ package com.vetti.framework.web.service; import com.google.common.collect.Sets; +import com.vetti.common.enums.UserFlagEnum; import com.vetti.common.exception.ServiceException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -94,6 +95,7 @@ public class SysRegisterService } else { + sysUser.setUserFlag(UserFlagEnum.FLAG_1.getCode()); sysUser.setSysUserType(registerBody.getSysUserType()); sysUser.setNickName(username); sysUser.setPwdUpdateDate(DateUtils.getNowDate()); diff --git a/vetti-hotake/src/main/java/com/vetti/hotake/domain/HotakeSysNotice.java b/vetti-hotake/src/main/java/com/vetti/hotake/domain/HotakeSysNotice.java deleted file mode 100644 index 7a78fb9..0000000 --- a/vetti-hotake/src/main/java/com/vetti/hotake/domain/HotakeSysNotice.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.vetti.hotake.domain; - -import lombok.Data; -import lombok.experimental.Accessors; -import io.swagger.annotations.ApiModelProperty; -import com.vetti.common.annotation.Excel; -import com.vetti.common.core.domain.BaseEntity; - -import java.util.List; - -/** - * 通知对象 hotake_sys_notice - * - * @author ID - * @date 2025-11-01 - */ -@Data -@Accessors(chain = true) -public class HotakeSysNotice extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键ID */ - @ApiModelProperty("主键ID") - private Long id; - - /** 通知类型ID */ - @ApiModelProperty("通知类型ID") - @Excel(name = "通知类型ID") - private Long noticeTypeId;//数据字典获取数据 hotake_sys_notice_type - - /** 投递简历ID */ - @ApiModelProperty("投递简历ID") - @Excel(name = "投递简历ID") - private Long cvId; - - /** 通知标题 */ - @ApiModelProperty("通知标题") - @Excel(name = "通知标题") - private String noticeTitle; - - /** 通知内容 */ - @ApiModelProperty("通知内容") - @Excel(name = "通知内容") - private String noticeContent; - - /** 发送人ID */ - @ApiModelProperty("发送人ID") - @Excel(name = "发送人ID") - private Long sendUserId; - - /** 接收人ID */ - @ApiModelProperty("接收人ID") - @Excel(name = "接收人ID") - private Long receiveUserId; - - /** 查看状态（0未看 1已看） */ - @ApiModelProperty("查看状态（0未看 1已看）") - @Excel(name = "查看状态", readConverterExp = "0=未看,1=已看") - private String isView; - - @ApiModelProperty("图片") - @Excel(name = "图片") - private List imagePath;//文件存储桶名 noticetype-fs - - /** 删除状态（0正常 1删除） */ - @ApiModelProperty("删除状态（0正常 1删除）") - @Excel(name = "删除状态", readConverterExp = "0=正常,1=删除") - private String isDel; - -} diff --git a/vetti-hotake/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeDto.java b/vetti-hotake/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeDto.java deleted file mode 100644 index 2a3d1c9..0000000 --- a/vetti-hotake/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeDto.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.vetti.hotake.domain.dto; - -import com.vetti.common.annotation.Excel; -import com.vetti.common.utils.bean.BeanUtils; -import com.vetti.hotake.domain.HotakeSysNotice; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @author ID - * @date 2025/11/1 16:50 - */ -@Data -public class HotakeSysNoticeDto extends HotakeSysNotice { - - @ApiModelProperty("通知类型名称") - private String noticeTypeName; - - @ApiModelProperty("图片") - private String img; - - @ApiModelProperty("招聘企业的名称") - private Long cvCompanyName; - - @ApiModelProperty("招聘企业的岗位") - private Long cvPosition; - - - public static HotakeSysNoticeDto build(HotakeSysNotice data, Map typeNameMap, String url) { - HotakeSysNoticeDto dto = new HotakeSysNoticeDto(); - BeanUtils.copyBeanProp(dto, data); - if (typeNameMap != null) { - dto.setNoticeTypeName(typeNameMap.get(data.getNoticeTypeId())); - } - dto.setImg(url); - - - return dto; - } -} diff --git a/vetti-hotake/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.java b/vetti-hotake/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.java deleted file mode 100644 index b9aaee8..0000000 --- a/vetti-hotake/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.vetti.hotake.domain.dto; - -import com.vetti.hotake.domain.HotakeSysNotice; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ID - * @date 2025/11/1 16:50 - */ -@Data -public class HotakeSysNoticeViewDto { - - @ApiModelProperty("未查看") - private List unreadList; - - @ApiModelProperty("归档") - private List archiveList; - -} diff --git a/vetti-hotake/src/main/java/com/vetti/hotake/mapper/HotakeSysNoticeMapper.java b/vetti-hotake/src/main/java/com/vetti/hotake/mapper/HotakeSysNoticeMapper.java deleted file mode 100644 index 03a8655..0000000 --- a/vetti-hotake/src/main/java/com/vetti/hotake/mapper/HotakeSysNoticeMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.vetti.hotake.mapper; - -import java.util.List; -import com.vetti.hotake.domain.HotakeSysNotice; - -/** - * 通知Mapper接口 - * - * @author ID - * @date 2025-11-01 - */ -public interface HotakeSysNoticeMapper -{ - /** - * 查询通知 - * - * @param id 通知主键 - * @return 通知 - */ - public HotakeSysNotice selectHotakeSysNoticeById(Long id); - - /** - * 查询通知列表 - * - * @param hotakeSysNotice 通知 - * @return 通知集合 - */ - public List selectHotakeSysNoticeList(HotakeSysNotice hotakeSysNotice); - - /** - * 新增通知 - * - * @param hotakeSysNotice 通知 - * @return 结果 - */ - public int insertHotakeSysNotice(HotakeSysNotice hotakeSysNotice); - - /** - * 修改通知 - * - * @param hotakeSysNotice 通知 - * @return 结果 - */ - public int updateHotakeSysNotice(HotakeSysNotice hotakeSysNotice); - - /** - * 删除通知 - * - * @param id 通知主键 - * @return 结果 - */ - public int deleteHotakeSysNoticeById(Long id); - - /** - * 批量删除通知 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteHotakeSysNoticeByIds(Long[] ids); - /** - * 批量新增通知 - * - * @param hotakeSysNoticeList 通知列表 - * @return 结果 - */ - public int batchInsertHotakeSysNotice(List hotakeSysNoticeList); - -} diff --git a/vetti-hotake/src/main/java/com/vetti/hotake/service/IHotakeSysNoticeService.java b/vetti-hotake/src/main/java/com/vetti/hotake/service/IHotakeSysNoticeService.java deleted file mode 100644 index bc43209..0000000 --- a/vetti-hotake/src/main/java/com/vetti/hotake/service/IHotakeSysNoticeService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.vetti.hotake.service; - -import java.util.List; -import com.vetti.hotake.domain.HotakeSysNotice; -import com.vetti.hotake.domain.dto.HotakeSysNoticeDto; -import com.vetti.hotake.domain.dto.HotakeSysNoticeViewDto; - -/** - * 通知Service接口 - * - * @author ID - * @date 2025-11-01 - */ -public interface IHotakeSysNoticeService -{ - /** - * 查询通知 - * - * @param id 通知主键 - * @return 通知 - */ - public HotakeSysNotice selectHotakeSysNoticeById(Long id); - - /** - * 查询通知列表 - * - * @param hotakeSysNotice 通知 - * @return 通知集合 - */ - public List selectHotakeSysNoticeList(HotakeSysNotice hotakeSysNotice); - - /** - * 新增通知 - * - * @param hotakeSysNotice 通知 - * @return 结果 - */ - public int insertHotakeSysNotice(HotakeSysNotice hotakeSysNotice); - - /** - * 修改通知 - * - * @param hotakeSysNotice 通知 - * @return 结果 - */ - public int updateHotakeSysNotice(HotakeSysNotice hotakeSysNotice); - - /** - * 批量删除通知 - * - * @param ids 需要删除的通知主键集合 - * @return 结果 - */ - public int deleteHotakeSysNoticeByIds(Long[] ids); - - /** - * 删除通知信息 - * - * @param id 通知主键 - * @return 结果 - */ - public int deleteHotakeSysNoticeById(Long id); - - /** - * 批量新增通知 - * - * @param hotakeSysNoticeList 通知列表 - * @return 结果 - */ - public int batchInsertHotakeSysNotice(List hotakeSysNoticeList); - - HotakeSysNoticeViewDto selectHotakeSysNoticeViewList(HotakeSysNotice hotakeSysNotice); - - HotakeSysNoticeDto selectHotakeSysNoticeViewById(Long id); - - int allRead(); -} diff --git a/vetti-hotake/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.java b/vetti-hotake/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.java deleted file mode 100644 index 7ab72d2..0000000 --- a/vetti-hotake/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.vetti.hotake.service.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.vetti.common.core.domain.entity.SysDictData; -import com.vetti.common.core.service.BaseServiceImpl; -import com.vetti.common.enums.FillTypeEnum; -import com.vetti.common.utils.DateUtils; -import com.vetti.hotake.domain.dto.HotakeSysNoticeDto; -import com.vetti.hotake.domain.dto.HotakeSysNoticeViewDto; -import com.vetti.hotake.service.IHotakeSysFileService; -import com.vetti.system.service.ISysDictDataService; -import io.swagger.annotations.ApiModelProperty; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.vetti.hotake.mapper.HotakeSysNoticeMapper; -import com.vetti.hotake.domain.HotakeSysNotice; -import com.vetti.hotake.service.IHotakeSysNoticeService; - -import static com.vetti.common.utils.SecurityUtils.getLoginUser; - -/** - * 通知Service业务层处理 - * - * @author ID - * @date 2025-11-01 - */ -@SuppressWarnings("all") -@Service -public class HotakeSysNoticeServiceImpl extends BaseServiceImpl implements IHotakeSysNoticeService { - @Autowired - private HotakeSysNoticeMapper hotakeSysNoticeMapper; - @Autowired - IHotakeSysFileService hotakeSysFileService; - @Autowired - ISysDictDataService sysDictDataService; - - private final String DICT_DATA_TYPE_KEY = "hotake_sys_notice_type"; - - /** - * 查询通知 - * - * @param id 通知主键 - * @return 通知 - */ - @Transactional(readOnly = true) - @Override - public HotakeSysNotice selectHotakeSysNoticeById(Long id) { - return hotakeSysNoticeMapper.selectHotakeSysNoticeById(id); - } - - /** - * 查询通知列表 - * - * @param hotakeSysNotice 通知 - * @return 通知 - */ - @Transactional(readOnly = true) - @Override - public List selectHotakeSysNoticeList(HotakeSysNotice hotakeSysNotice) { - return hotakeSysNoticeMapper.selectHotakeSysNoticeList(hotakeSysNotice); - } - - /** - * 新增通知 - * - * @param hotakeSysNotice 通知 - * @return 结果 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public int insertHotakeSysNotice(HotakeSysNotice hotakeSysNotice) { - fill(FillTypeEnum.INSERT.getCode(), hotakeSysNotice); - return hotakeSysNoticeMapper.insertHotakeSysNotice(hotakeSysNotice); - } - - /** - * 修改通知 - * - * @param hotakeSysNotice 通知 - * @return 结果 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public int updateHotakeSysNotice(HotakeSysNotice hotakeSysNotice) { - fill(FillTypeEnum.UPDATE.getCode(), hotakeSysNotice); - return hotakeSysNoticeMapper.updateHotakeSysNotice(hotakeSysNotice); - } - - /** - * 批量删除通知 - * - * @param ids 需要删除的通知主键 - * @return 结果 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public int deleteHotakeSysNoticeByIds(Long[] ids) { - return hotakeSysNoticeMapper.deleteHotakeSysNoticeByIds(ids); - } - - /** - * 删除通知信息 - * - * @param id 通知主键 - * @return 结果 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public int deleteHotakeSysNoticeById(Long id) { - return hotakeSysNoticeMapper.deleteHotakeSysNoticeById(id); - } - - /** - * 批量新增通知 - * - * @param hotakeSysNoticeList 通知列表 - * @return 结果 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public int batchInsertHotakeSysNotice(List hotakeSysNoticeList) { - return hotakeSysNoticeMapper.batchInsertHotakeSysNotice(hotakeSysNoticeList); - } - - @Override - public HotakeSysNoticeViewDto selectHotakeSysNoticeViewList(HotakeSysNotice hotakeSysNotice) { - HotakeSysNotice query = new HotakeSysNoticeDto(); - query.setIsDel("0"); - query.setReceiveUserId(getLoginUser().getUserId()); - List list = hotakeSysNoticeMapper.selectHotakeSysNoticeList(query); - if (CollectionUtils.isEmpty(list)) { - return new HotakeSysNoticeViewDto(); - } - HotakeSysNoticeViewDto data = new HotakeSysNoticeViewDto(); - List unreadList = new ArrayList<>(); - List archiveList = new ArrayList<>(); - Map typeNameMap = typeName(); - list.forEach(e -> { - if ("0".equals(e.getIsView())) { - unreadList.add(HotakeSysNoticeDto.build(e, typeNameMap, url(e))); - } else if ("1".equals(e.getIsView())) { - archiveList.add(HotakeSysNoticeDto.build(e, typeNameMap, url(e))); - } - }); - data.setUnreadList(unreadList); - data.setArchiveList(archiveList); - return data; - } - - @Override - public HotakeSysNoticeDto selectHotakeSysNoticeViewById(Long id) { - HotakeSysNotice data = hotakeSysNoticeMapper.selectHotakeSysNoticeById(id); - data.setIsView("1"); - fill(FillTypeEnum.UPDATE.getCode(), data); - hotakeSysNoticeMapper.updateHotakeSysNotice(data); - return HotakeSysNoticeDto.build(data, typeName(), url(data)); - } - - @Override - public int allRead() { - HotakeSysNotice query = new HotakeSysNoticeDto(); - query.setIsDel("0"); - query.setReceiveUserId(getLoginUser().getUserId()); - List list = hotakeSysNoticeMapper.selectHotakeSysNoticeList(query); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(e -> { - e.setIsView("1"); - fill(FillTypeEnum.UPDATE.getCode(), e); - hotakeSysNoticeMapper.updateHotakeSysNotice(e); - }); - } - return 1; - } - - private String url(HotakeSysNotice d) { - if (CollectionUtils.isNotEmpty(d.getImagePath())) { - return hotakeSysFileService.url(Long.parseLong(d.getImagePath().get(0))); - } - return ""; - } - - - private Map typeName() { - SysDictData query = new SysDictData(); - query.setDictType(DICT_DATA_TYPE_KEY); - List list = sysDictDataService.selectDictDataList(query); - if (CollectionUtils.isEmpty(list)) { - return null; - } - Map map = new HashMap<>(); - list.forEach(e -> map.put(e.getDictCode(), e.getDictLabel())); - return map; - } - -} diff --git a/vetti-hotakes/target/classes/mapper/hotake/HotakeSysFileMapper.xml b/vetti-hotakes/target/classes/mapper/hotake/HotakeSysFileMapper.xml new file mode 100644 index 0000000..dc50c6d --- /dev/null +++ b/vetti-hotakes/target/classes/mapper/hotake/HotakeSysFileMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, minio_bucket_name, code, file_name, file_type, file_size, storage_path, file_md5, upload_platform, available, create_by, create_time, update_by, update_time, remark from hotake_sys_file + + + + + + + + insert into Hotake_sys_file + + minio_bucket_name, + code, + file_name, + file_type, + file_size, + storage_path, + file_md5, + upload_platform, + available, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{minioBucketName}, + #{code}, + #{fileName}, + #{fileType}, + #{fileSize}, + #{storagePath}, + #{fileMd5}, + #{uploadPlatform}, + #{available}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update Hotake_sys_file + + minio_bucket_name = #{minioBucketName}, + code = #{code}, + file_name = #{fileName}, + file_type = #{fileType}, + file_size = #{fileSize}, + storage_path = #{storagePath}, + file_md5 = #{fileMd5}, + upload_platform = #{uploadPlatform}, + available = #{available}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from Hotake_sys_file where id = #{id} + + + + delete from Hotake_sys_file where id in + + #{id} + + + + + insert into Hotake_sys_file( id, minio_bucket_name, code, file_name, file_type, file_size, storage_path, file_md5, upload_platform, available, create_by, create_time, update_by, update_time, remark,) values + + ( #{item.id}, #{item.minioBucketName}, #{item.code}, #{item.fileName}, #{item.fileType}, #{item.fileSize}, #{item.storagePath}, #{item.fileMd5}, #{item.uploadPlatform}, #{item.available}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark},) + + + + + + \ No newline at end of file diff --git a/vetti-hotake/src/main/resources/mapper/hotake/HotakeSysNoticeMapper.xml b/vetti-hotakes/target/classes/mapper/hotake/HotakeSysNoticeMapper.xml similarity index 100% rename from vetti-hotake/src/main/resources/mapper/hotake/HotakeSysNoticeMapper.xml rename to vetti-hotakes/target/classes/mapper/hotake/HotakeSysNoticeMapper.xml diff --git a/vetti-hotakes/target/maven-archiver/pom.properties b/vetti-hotakes/target/maven-archiver/pom.properties new file mode 100644 index 0000000..6465571 --- /dev/null +++ b/vetti-hotakes/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Sat Nov 01 22:10:37 CST 2025 +artifactId=vetti-hotakes +groupId=com.vetti +version=3.9.0 diff --git a/vetti-hotakes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/vetti-hotakes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..da0d867 --- /dev/null +++ b/vetti-hotakes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,6 @@ +com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.class +com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.class +com/vetti/hotake/service/IHotakeSysNoticeService.class +com/vetti/hotake/domain/HotakeSysNotice.class +com/vetti/hotake/domain/dto/HotakeSysNoticeDto.class +com/vetti/hotake/mapper/HotakeSysNoticeMapper.class diff --git a/vetti-hotakes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/vetti-hotakes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..58ffdff --- /dev/null +++ b/vetti-hotakes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,2 @@ +/Users/wangxiangshun/Public/project-aio/vetti/vetti-service/vetti-ai/src/main/java/com/vetti/ai/service/ChatCommonService.java +/Users/wangxiangshun/Public/project-aio/vetti/vetti-service/vetti-ai/src/main/java/com/vetti/ai/service/impl/ChatCommonServiceImpl.java diff --git a/vetti-hotakes/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/vetti-hotakes/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/vetti-system/src/main/resources/mapper/system/SysUserMapper.xml b/vetti-system/src/main/resources/mapper/system/SysUserMapper.xml index 4f86fc6..7b9217f 100644 --- a/vetti-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/vetti-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -35,6 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -63,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.sys_user_type - ,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json + ,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json,u.address,u.user_flag from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id @@ -72,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, - u.create_time,u.sys_user_type,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json + u.create_time,u.sys_user_type,u.steps,u.job_position,u.experience,u.cv_url,u.location, + u.job_type,u.relocate,u.best_side_json,u.address,u.user_flag from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id @@ -123,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"