geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步框架更新

Browse Source
This commit is contained in:
yaoyn
2025-02-15 17:05:09 +08:00
parent 29b5c68564
commit 9b7d27a2b4
141 changed files with 585 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xjrsoft-service/xjrsoft-service-form/pom.xml
View File

@ -50,12 +50,14 @@
<artifactId>xjrsoft-service-magicapi-api</artifactId>
<version>${xjrsoft.framework.version}</version>
</dependency>
<dependency>
<groupId>com.xjrsoft</groupId>
<artifactId>xjrsoft-service-generate-api</artifactId>
<version>${xjrsoft.framework.version}</version>
</dependency>
<dependency>
<groupId>com.xjrsoft</groupId>
<artifactId>xjrsoft-service-app-api</artifactId>

68
xjrsoft-service/xjrsoft-service-form/src/main/java/com/xjrsoft/form/client/FormReleaseClient.java Normal file
View File

@ -0,0 +1,68 @@
package com.xjrsoft.form.client;
import com.github.yulichang.toolkit.MPJWrappers;
import com.xjrsoft.common.core.constant.GlobalConstant;
import com.xjrsoft.form.entity.FormRelease;
import com.xjrsoft.form.service.IFormReleaseService;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Author: zn
* @Date: 2025/02/13 16:19
*/
@Hidden
@RestController
@AllArgsConstructor
public class FormReleaseClient implements IFormReleaseClient{
private final IFormReleaseService formReleaseService;
/**
* 查询单个接口
* @param id
* @return
*/
@Override
@GetMapping(GlobalConstant.CLIENT_API_PRE + GlobalConstant.MODULE_FORM_NAME + "/selectByIdFeign")
public FormRelease selectByIdFeign(Long id) {
return formReleaseService.getById(id);
}
/**
* 查询单条数据
* @param formRelease
* @return
*/
@Override
@GetMapping(GlobalConstant.CLIENT_API_PRE + GlobalConstant.MODULE_FORM_NAME + "/selectByFormReleaseFeign")
public FormRelease selectByFormReleaseFeign(FormRelease formRelease) {
FormRelease release = formReleaseService.getOne(MPJWrappers.<FormRelease>lambdaJoin()
.eq(ObjectUtils.isNotEmpty(formRelease.getFormId()), FormRelease::getFormId, formRelease.getFormId())
.orderByDesc(FormRelease::getCreateDate));
return release;
}
/**
* 查询List
* @param formRelease
* @return
*/
@Override
@GetMapping(GlobalConstant.CLIENT_API_PRE + GlobalConstant.MODULE_FORM_NAME + "/selectListFeign")
public List<FormRelease> selectListFeign(FormRelease formRelease) {
List<FormRelease> releaseList = formReleaseService.list(MPJWrappers.<FormRelease>lambdaJoin()
.eq(ObjectUtils.isNotEmpty(formRelease.getFormId()), FormRelease::getFormId, formRelease.getFormId())
.orderByDesc(FormRelease::getCreateDate));
return releaseList;
}
}

18
xjrsoft-service/xjrsoft-service-form/src/main/java/com/xjrsoft/form/mapper/FormHistoryMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.form.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.form.entity.FormHistory;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 自定义表单历史表 每次修改自定义表单会新增一条数据 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-05-09
*/
@Mapper
public interface FormHistoryMapper extends MPJBaseMapper<FormHistory> {
}

18
xjrsoft-service/xjrsoft-service-form/src/main/java/com/xjrsoft/form/mapper/FormReleaseMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.form.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.form.entity.FormRelease;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 自定义表单 发布表 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-05-09
*/
@Mapper
public interface FormReleaseMapper extends MPJBaseMapper<FormRelease> {
}

18
xjrsoft-service/xjrsoft-service-form/src/main/java/com/xjrsoft/form/mapper/FormTemplateMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.form.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.form.entity.FormTemplate;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 表单设计模板 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-05-09
*/
@Mapper
public interface FormTemplateMapper extends MPJBaseMapper<FormTemplate> {
}

2
xjrsoft-service/xjrsoft-service-form/src/main/java/com/xjrsoft/form/service/impl/FormExecuteServiceImpl.java
View File

@ -59,7 +59,6 @@ import com.xjrsoft.generate.utils.GeneratorUtil;
import com.xjrsoft.system.client.ICodeRuleClient;
import com.xjrsoft.system.entity.Menu;
import com.xjrsoft.tenant.config.TenantConfig;
import com.xjrsoft.tenant.util.SecureUtil;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import net.sf.jsqlparser.expression.*;
@ -1814,6 +1813,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
queryExpression = new AndExpression(queryExpression, dataAuthExpression);
}
}
plainSelect.setWhere(queryExpression);
Db use = Db.use(datasource);
use.setRunner(new XjrSqlConnRunner(DialectFactory.getDialect(datasource)));

2
xjrsoft-service/xjrsoft-service-form/src/main/java/com/xjrsoft/form/service/impl/FormTemplateServiceImpl.java
View File

@ -6,8 +6,6 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.db.Db;
import cn.hutool.db.DbUtil;
import cn.hutool.db.meta.MetaUtil;
import cn.hutool.json.JSONConfig;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;