Merge remote-tracking branch 'origin/main'

This commit is contained in:
gaoqr
2024-08-02 11:24:09 +08:00
20 changed files with 403 additions and 67 deletions
@@ -0,0 +1,30 @@
package com.cf.imes.module.system.api.setting;
import com.cf.imes.module.system.api.setting.dto.PackageConfigDTO;
import com.cf.imes.module.system.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
@FeignClient(name = ApiConstants.NAME) // TODO 晨丰:fallbackFactory =
@Tag(name = "RPC 服务 - 系统配置")
public interface SettingApi {
String PREFIX = ApiConstants.PREFIX + "/setting";
@GetMapping(PREFIX + "/getUserSetting")
@Operation(summary = "查看当前用户的配置信息")
@Parameter(name = "type", description = "配置配型", required = true, example = "1")
PackageConfigDTO getUserSetting(@RequestParam("type") Integer type);
}
@@ -0,0 +1,37 @@
package com.cf.imes.module.system.api.setting.dto;
import com.alibaba.fastjson.JSONObject;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class PackageConfigDTO {
@Schema(description = "主键")
private Long id;
@Schema(description = "组织ID")
private Long organId;
@Schema(description = "用户ID")
private Long userId;
@Schema(description = "配置类型: 1 预打包,2 打包", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer type;
@Schema(description = "配置信息", requiredMode = Schema.RequiredMode.REQUIRED)
private String setting;
}
@@ -0,0 +1,34 @@
package com.cf.imes.module.system.api.setting;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.security.core.LoginUser;
import com.cf.imes.module.system.api.setting.dto.PackageConfigDTO;
import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO;
import com.cf.imes.module.system.dal.mysql.setting.SettingMapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
@RestController // 提供 RESTful API 接口,给 Feign 调用
@Validated
public class SettingApiImpl implements SettingApi{
@Resource
private SettingMapper settingMapper;
@Override
public PackageConfigDTO getUserSetting(Integer type) {
LoginUser loginUser = getLoginUser();
PackageConfigDO packageConfigDO = settingMapper.selectSetting(type, loginUser.getId(), loginUser.getOrganId());
return BeanUtils.toBean(packageConfigDO,PackageConfigDTO.class);
}
}