toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
daiqy88
2025-11-13 14:30:26 +08:00
parent 1976207d2e 02f3cf8d81
commit 3391c7f8a5
34 changed files with 264 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system/src/main/java/com/sdm/system/controller/SimulationAppCenterController.java
View File

@@ -1,9 +1,6 @@
package com.sdm.system.controller;
import com.sdm.common.common.SdmResponse;
import com.sdm.system.model.bo.DataDictionary;
import com.sdm.system.model.bo.DictionaryClass;
import com.sdm.system.model.bo.FormConfigure;
import com.sdm.system.model.entity.AppCenterItemBean;
import com.sdm.system.model.entity.AppConfigureBean;
import com.sdm.system.service.ISimulatinoAppCenterService;

11
system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java
View File

@@ -5,10 +5,14 @@ import com.sdm.system.model.bo.DataDictionary;
import com.sdm.system.model.bo.DictionaryClass;
import com.sdm.system.model.bo.FormConfigure;
import com.sdm.system.model.req.system.FormConfigureReq;
import com.sdm.system.model.resp.SimuDictionaryResp;
import com.sdm.system.service.ISimulationSystemConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = "/systemData")
public class SimulationSystemConfigController {
@@ -37,6 +41,13 @@ public class SimulationSystemConfigController {
return service.queryDictionaryData(dictClass);
}
@GetMapping(value = "/getAllDictionaryData")
@ResponseBody
SdmResponse<Map<String, List<SimuDictionaryResp>>> getAllDictionaryData()
{
return service.getAllDictionaryData();
}
@GetMapping(value = "/deleteDictionaryData")
@ResponseBody
SdmResponse deleteDictionaryData(@RequestParam("uuid")String uuid)

6
system/src/main/java/com/sdm/system/controller/SysUserController.java
View File

@@ -1,16 +1,16 @@
package com.sdm.system.controller;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.system.QueryGroupDetailReq;
import com.sdm.common.entity.req.system.UserListReq;
import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.system.CIDRoleResp;
import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.feign.inter.system.ISysUserFeignClient;
import com.sdm.system.model.entity.SysRole;
import com.sdm.system.model.req.user.*;
import com.sdm.system.model.resp.SysUserGroupDetailResp;
import com.sdm.system.model.resp.SysUserGroupResp;
import com.sdm.common.entity.resp.system.SysUserGroupDetailResp;
import com.sdm.common.entity.resp.system.SysUserGroupResp;
import com.sdm.system.service.ISysUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

4
system/src/main/java/com/sdm/system/dao/SimulationAppManageMapper.java
View File

@@ -1,9 +1,5 @@
package com.sdm.system.dao;
import com.sdm.common.common.SdmResponse;
import com.sdm.system.model.bo.DataDictionary;
import com.sdm.system.model.bo.DictionaryClass;
import com.sdm.system.model.bo.FormConfigure;
import com.sdm.system.model.entity.AppCenterItemBean;
import com.sdm.system.model.entity.AppConfigureBean;
import org.apache.ibatis.annotations.*;

3
system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java
View File

@@ -17,6 +17,9 @@ public interface SimulationSystemMapper {
@Select("SELECT * FROM simulation_data_dictionary WHERE dictClass=#{dictClass} ORDER BY dictOrder ASC")
List<DataDictionary> queryDictionaryClassData(@Param("dictClass")String dictClass);
@Select("SELECT * FROM simulation_data_dictionary")
List<DataDictionary> getAllDictionaryData();
@Delete("DELETE FROM simulation_data_dictionary WHERE dictClass=#{dictClass}")
int deleteDictionaryClassItems(@Param("dictClass")String dictClass);

6
system/src/main/java/com/sdm/system/model/bo/FormConfigure.java
View File

@@ -4,12 +4,8 @@ import com.sdm.common.entity.bo.BaseBean;
import lombok.Data;
@Data
public class FormConfigure extends BaseBean {
public class FormConfigure{
public FormConfigure()
{
init();
}
public int id;
public String formName;

18
system/src/main/java/com/sdm/system/model/req/user/QueryGroupDetailReq.java
View File

@@ -1,18 +0,0 @@
package com.sdm.system.model.req.user;
import com.sdm.system.model.req.BaseReq;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
@Data
public class QueryGroupDetailReq extends BaseReq {
@Schema(description = "用户组id")
@NotNull(message = "用户组id不能为空")
Long id;
@Parameter(description = "租户id")
Long tenantId ;
}

21
system/src/main/java/com/sdm/system/model/resp/SimuDictionaryResp.java Normal file
View File

@@ -0,0 +1,21 @@
package com.sdm.system.model.resp;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
public class SimuDictionaryResp {
public String dictName;
public String dictValue;
public String dictClass;
public SimuDictionaryResp(String dictValue, String dictClass, String dictName) {
this.dictValue = dictValue;
this.dictClass = dictClass;
this.dictName = dictName;
}
}

35
system/src/main/java/com/sdm/system/model/resp/SysUserGroupDetailResp.java
View File

@@ -1,35 +0,0 @@
package com.sdm.system.model.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.system.CIDUserResp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
* 用户组
* </p>
*
* @author author
* @since 2025-09-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@Schema( description="用户组和组成员信息查询")
public class SysUserGroupDetailResp implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "用户组信息")
SysUserGroupResp sysUserGroup;
@Schema(description = "用户信息")
PageDataResp<List<CIDUserResp>> users;
}

43
system/src/main/java/com/sdm/system/model/resp/SysUserGroupResp.java
View File

@@ -1,43 +0,0 @@
package com.sdm.system.model.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 用户组
* </p>
*
* @author author
* @since 2025-09-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@Schema( description="用户组")
public class SysUserGroupResp implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "组唯一标识ID")
private Integer id;
@Schema(description = "组名")
private String groupName;
@Schema(description = "组描述")
private String description;
@Schema(description = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createdTime;
@Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updatedTime;
}

6
system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java
View File

@@ -5,6 +5,10 @@ import com.sdm.system.model.bo.DataDictionary;
import com.sdm.system.model.bo.DictionaryClass;
import com.sdm.system.model.bo.FormConfigure;
import com.sdm.system.model.req.system.FormConfigureReq;
import com.sdm.system.model.resp.SimuDictionaryResp;
import java.util.List;
import java.util.Map;
public interface ISimulationSystemConfigService {
@@ -12,6 +16,8 @@ public interface ISimulationSystemConfigService {
SdmResponse queryDictionaryData(String dictClass);
SdmResponse<Map<String, List<SimuDictionaryResp>>> getAllDictionaryData();
SdmResponse deleteDataDictionary(String uuid);
SdmResponse deleteDataDictionaryClass(String className);

5
system/src/main/java/com/sdm/system/service/ISysUserService.java
View File

@@ -2,6 +2,7 @@ package com.sdm.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.system.QueryGroupDetailReq;
import com.sdm.common.entity.req.system.UserListReq;
import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.system.CIDRoleResp;
@@ -9,8 +10,8 @@ import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.system.model.entity.SysUser;
import com.sdm.system.model.req.user.*;
import com.sdm.system.model.resp.SysUserGroupDetailResp;
import com.sdm.system.model.resp.SysUserGroupResp;
import com.sdm.common.entity.resp.system.SysUserGroupDetailResp;
import com.sdm.common.entity.resp.system.SysUserGroupResp;
import java.util.List;

6
system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java
View File

@@ -6,17 +6,17 @@ import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext;
import com.sdm.common.entity.req.system.QueryGroupDetailReq;
import com.sdm.common.entity.req.system.UserListReq;
import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.system.CIDRoleResp;
import com.sdm.system.dao.SysUserMapper;
import com.sdm.system.model.entity.SysRole;
import com.sdm.system.model.entity.SysUser;
import com.sdm.system.model.req.user.*;
import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.system.model.resp.SysUserGroupDetailResp;
import com.sdm.system.model.resp.SysUserGroupResp;
import com.sdm.common.entity.resp.system.SysUserGroupDetailResp;
import com.sdm.common.entity.resp.system.SysUserGroupResp;
import com.sdm.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;

3
system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.system.QueryGroupDetailReq;
import com.sdm.common.entity.req.system.UserListReq;
import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.PageDataResp;
@@ -15,7 +16,7 @@ import com.sdm.system.dao.SysUserMapper;
import com.sdm.system.model.entity.*;
import com.sdm.system.model.req.user.*;
import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.system.model.resp.SysUserGroupResp;
import com.sdm.common.entity.resp.system.SysUserGroupResp;
import com.sdm.system.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;

37
system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.sdm.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sdm.common.common.SdmResponse;
@@ -14,14 +16,18 @@ import com.sdm.system.model.bo.DictionaryClass;
import com.sdm.system.model.bo.FormConfigure;
import com.sdm.system.model.entity.SysFormConfigure;
import com.sdm.system.model.req.system.FormConfigureReq;
import com.sdm.system.model.resp.SimuDictionaryResp;
import com.sdm.system.service.IFormConfigureService;
import com.sdm.system.service.ISimulationSystemConfigService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
public class SimulationSystemConfigServiceImpl extends BaseService implements ISimulationSystemConfigService {
@@ -109,6 +115,17 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
return response;
}
/**
* 查询全量数据字典条目
* @return
*/
public SdmResponse<Map<String, List<SimuDictionaryResp>> > getAllDictionaryData() {
List<DataDictionary> dictionaries = mapper.getAllDictionaryData();
List<SimuDictionaryResp> newDictionaries = dictionaries.stream().filter(i -> StringUtils.isNotBlank(i.dictClass)).map(i -> new SimuDictionaryResp(i.dictValue, i.dictClass, i.dictName)).collect(Collectors.toList());
Map<String, List<SimuDictionaryResp>> dictionMap = newDictionaries.stream().collect(Collectors.groupingBy(SimuDictionaryResp::getDictClass));
return SdmResponse.success(dictionMap);
}
/**
* 更新数据字典条目
* @param dict
@@ -264,11 +281,15 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
public SdmResponse updateSystemFormConfigure(FormConfigure configure) {
SdmResponse response = SdmResponse.success();
if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).list())) {
SysFormConfigure sysFormConfigure = new SysFormConfigure();
BeanUtils.copyProperties(configure, sysFormConfigure);
if (formConfigureService.updateById(sysFormConfigure)) {
response = SdmResponse.failed("更新表单配置失败");
LambdaUpdateWrapper<SysFormConfigure> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(SysFormConfigure::getFormName, configure.getFormName());
if (configure.getFormConfig() != null) {
updateWrapper.set(SysFormConfigure::getFormConfig, configure.getFormConfig());
}
if (configure.getComment() != null) {
updateWrapper.set(SysFormConfigure::getComment, configure.getComment());
}
formConfigureService.update(updateWrapper);
} else {
response = SdmResponse.failed("该表单配置不存在");
}
@@ -306,7 +327,13 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
public SdmResponse listFormConfigure(FormConfigureReq req) {
PageHelper.startPage(req.getCurrent(), req.getSize());
// 过滤第一条数据 第一条是解释这张表的用途的
List<SysFormConfigure> list = formConfigureService.lambdaQuery().ne(SysFormConfigure::getFormConfig, "ProjectType").list();
LambdaQueryWrapper<SysFormConfigure> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ne(SysFormConfigure::getFormConfig, "ProjectType");
if (StringUtils.isNotBlank(req.formName)) {
queryWrapper.like(SysFormConfigure::getFormName, req.formName);
}
queryWrapper.orderByDesc(SysFormConfigure::getCreateTime);
List<SysFormConfigure> list = formConfigureService.list(queryWrapper);
if (CollectionUtils.isEmpty(list)) {
return SdmResponse.failed("自定义表单列表为空，请初始化");
}

13
system/src/main/resources/application-local.yml
View File

@@ -119,7 +119,7 @@ file:
system:
useCidSwitch: false
useCidSwitch: true
userSystem:
cidUser: cid
@@ -134,8 +134,8 @@ tenantSystem:
localTenant: local
cid:
## url: http://192.168.65.162:8989/honeycom-spdm # 请根据实际CID服务地址修改
url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址
url: http://192.168.65.162:8989/honeycom-spdm # 请根据实际CID服务地址修改
## url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址
user:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail
@@ -157,4 +157,9 @@ cid:
queryFlowTemplate: /spdm-flow/listProcessByGroup
queryApproveDetail: /spdm-flow/queryFlowNodeDetail
stopApproveFlow: /spdm-flow/stopFlow
group: SPDM
group: SPDM
# 0单机处理，可以指向本地，1负载均衡轮询
serverType: 0
#serverIp: 192.168.65.161
serverIp: 192.168.65.73

6
system/src/main/resources/application-prod.yml
View File

@@ -130,7 +130,7 @@ scheduled:
syncUser: 0 0 4 * * ?
system:
useCidSwitch: false
useCidSwitch: true
userSystem:
cidUser: cid
@@ -145,8 +145,8 @@ tenantSystem:
localTenant: local
cid:
## url: http://192.168.65.162:8989/honeycom-spdm # 请根据实际CID服务地址修改
url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址
url: http://192.168.65.162:8989/honeycom-spdm # 请根据实际CID服务地址修改
## url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址
user:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail

6
system/src/main/resources/application-test.yml
View File

@@ -128,7 +128,7 @@ scheduled:
syncUser: 0 0 4 * * ?
system:
useCidSwitch: false
useCidSwitch: true
userSystem:
cidUser: cid
@@ -143,8 +143,8 @@ tenantSystem:
localTenant: local
cid:
## url: http://192.168.65.162:8989/honeycom-spdm # 请根据实际CID服务地址修改
url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址
url: http://192.168.65.162:8989/honeycom-spdm # 请根据实际CID服务地址修改
## url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址
user:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail

2
system/src/main/resources/application.yml
View File

@@ -1,3 +1,3 @@
spring:
profiles:
active: dev
active: local