This commit is contained in:
ls
2024-11-05 11:00:34 +08:00
parent 83fa274068
commit 639d0ee799
541 changed files with 29300 additions and 26585 deletions

View File

@@ -44,7 +44,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler
@Autowired
private JeecgBaseConfig jeecgBaseConfig;
/**
* 初始化 whiteTablesRuleMap 方法
*/
@@ -172,7 +172,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler
// 需要合并的字段
Set<String> waitMergerFields = new HashSet<>();
for (String field : queryFields) {
if(oConvertUtils.isEmpty(field)){
if (oConvertUtils.isEmpty(field)) {
continue;
}
// 统一转成小写
@@ -235,7 +235,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler
return true;
}
/**
* 取where前面的为table name
*

View File

@@ -9,16 +9,16 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @Description: 代码生成器,自定义DB配置
* @Description: 代码生成器, 自定义DB配置
* 【加了此类则online模式DB连接使用平台的配置jeecg_database.properties配置无效;
* 但是使用GUI模式代码生成还是走jeecg_database.properties配置】
* 提醒: 达梦数据库需要修改下面的参数${spring.datasource.dynamic.datasource.master.url:}配置
* 但是使用GUI模式代码生成还是走jeecg_database.properties配置】
* 提醒: 达梦数据库需要修改下面的参数${spring.datasource.dynamic.datasource.master.url:}配置
* @author: scott
* @date: 2021年02月18日 16:30
*
* <p>
* 重要说明:此类改路径或者名称,需要同步修改
* org/jeecg/interceptor/OnlineRepairCodeGenerateDbConfig.java里面的注解
* @ConditionalOnMissingClass("org.jeecg.config.init.CodeGenerateDbConfig")
* org/jeecg/interceptor/OnlineRepairCodeGenerateDbConfig.java里面的注解
* @ConditionalOnMissingClass("org.jeecg.config.init.CodeGenerateDbConfig")
*/
@Slf4j
@Configuration
@@ -37,8 +37,8 @@ public class CodeGenerateDbConfig {
@Bean
public CodeGenerateDbConfig initCodeGenerateDbConfig() {
if(StringUtils.isNotBlank(url)){
if(StringUtils.isNotBlank(publicKey)){
if (StringUtils.isNotBlank(url)) {
if (StringUtils.isNotBlank(publicKey)) {
try {
password = ConfigTools.decrypt(publicKey, password);
} catch (Exception e) {
@@ -46,7 +46,7 @@ public class CodeGenerateDbConfig {
log.error(" 代码生成器数据库连接,数据库密码解密失败!");
}
}
CodegenDatasourceConfig.initDbConfig(driverClassName,url, username, password);
CodegenDatasourceConfig.initDbConfig(driverClassName, url, username, password);
log.info(" Init CodeGenerate Config [ Get Db Config From application.yml ] ");
}
return null;

View File

@@ -17,6 +17,7 @@ import java.nio.charset.StandardCharsets;
* 自动初始化代码生成器模板
* <p>
* 解决JAR发布需要手工配置代码生成器模板问题
*
* @author zhang
*/
@Slf4j

View File

@@ -6,7 +6,7 @@
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//
///**
/// **
// * @Description: TomcatFactoryConfig
// * @author: scott
// * @date: 2021年01月25日 11:40

View File

@@ -36,40 +36,41 @@ public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
@Autowired
@Lazy
private ISysBaseAPI sysBaseApi;
/**
* 根据多个字典code查询多个字典项
* 根据多个字典code查询多个字典项
*
* @param codeList
* @return key = dictCode value=对应的字典项
*/
@Override
public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
Map<String, List<DragDictModel>> manyDragDictItems = new HashMap<>();
Map<String, List<DragDictModel>> manyDragDictItems = new HashMap<>();
Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
dictItemsMap.forEach((k,v)->{
List<DragDictModel> dictItems = new ArrayList<>();
v.forEach(dictItem->{
dictItemsMap.forEach((k, v) -> {
List<DragDictModel> dictItems = new ArrayList<>();
v.forEach(dictItem -> {
DragDictModel dictModel = new DragDictModel();
BeanUtils.copyProperties(dictItem,dictModel);
BeanUtils.copyProperties(dictItem, dictModel);
dictItems.add(dictModel);
});
manyDragDictItems.put(k,dictItems);
manyDragDictItems.put(k, dictItems);
});
return manyDragDictItems;
}
/**
*
* @param dictCode
* @return
*/
@Override
public List<DragDictModel> getDictItems(String dictCode) {
List<DragDictModel> dictItems = new ArrayList<>();
if(oConvertUtils.isNotEmpty(dictCode)){
List<DragDictModel> dictItems = new ArrayList<>();
if (oConvertUtils.isNotEmpty(dictCode)) {
List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode);
dictItemsList.forEach(dictItem->{
dictItemsList.forEach(dictItem -> {
DragDictModel dictModel = new DragDictModel();
BeanUtils.copyProperties(dictItem,dictModel);
BeanUtils.copyProperties(dictItem, dictModel);
dictItems.add(dictModel);
});
}
@@ -78,25 +79,27 @@ public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
/**
* 添加日志
*
* @param dragLogDTO
*/
@Override
public void addLog(DragLogDTO dragLogDTO) {
if(oConvertUtils.isNotEmpty(dragLogDTO)){
if (oConvertUtils.isNotEmpty(dragLogDTO)) {
LogDTO dto = new LogDTO();
BeanUtils.copyProperties(dragLogDTO,dto);
BeanUtils.copyProperties(dragLogDTO, dto);
baseCommonService.addLog(dto);
}
}
/**
* 保存日志
*
* @param logMsg
* @param logType
* @param operateType
*/
@Override
public void addLog(String logMsg, int logType, int operateType) {
baseCommonService.addLog(logMsg,logType,operateType);
baseCommonService.addLog(logMsg, logType, operateType);
}
}

View File

@@ -1,5 +1,6 @@
package org.jeecg.config.jimureport;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.SysUserCacheInfo;
@@ -12,15 +13,15 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
/**
* 自定义积木报表鉴权(如果不进行自定义,则所有请求不做权限控制)
* * 1.自定义获取登录token
* * 2.自定义获取登录用户
* * 1.自定义获取登录token
* * 2.自定义获取登录用户
*
* @author: jeecg-boot
*/
@@ -48,7 +49,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
public String[] getRoles(String token) {
String username = JwtUtil.getUsername(token);
Set roles = sysBaseApi.getUserRoleSet(username);
if(CollectionUtils.isEmpty(roles)){
if (CollectionUtils.isEmpty(roles)) {
return null;
}
return (String[]) roles.toArray(new String[roles.size()]);
@@ -68,7 +69,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
try {
userInfo = sysBaseApi.getCacheUser(username);
} catch (Exception e) {
log.error("获取用户信息异常:"+ e.getMessage());
log.error("获取用户信息异常:" + e.getMessage());
return map;
}
//设置账号名

View File

@@ -1,13 +1,10 @@
package org.jeecg.modules.aop;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.enums.ModuleType;
import java.lang.annotation.*;
/**
* 系统日志注解
*
*
* @Author scott
* @email jeecgos@163.com
* @Date 2019年1月14日
@@ -17,11 +14,11 @@ import java.lang.annotation.*;
@Documented
public @interface TenantLog {
/**
* 操作日志类型1查询2添加3修改4删除
*
* @return
*/
int value() default 0;
/**
* 操作日志类型1查询2添加3修改4删除
*
* @return
*/
int value() default 0;
}

View File

@@ -1,5 +1,6 @@
package org.jeecg.modules.aop;
import jakarta.annotation.Resource;
import org.apache.shiro.SecurityUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
@@ -15,7 +16,6 @@ import org.jeecg.modules.system.entity.SysTenantPack;
import org.jeecg.modules.system.entity.SysTenantPackUser;
import org.springframework.stereotype.Component;
import jakarta.annotation.Resource;
import java.lang.reflect.Method;
import java.util.Date;
@@ -36,43 +36,43 @@ public class TenantPackUserLogAspect {
}
@Around("tenantLogPointCut()")
public Object aroundMethod(ProceedingJoinPoint joinPoint)throws Throwable {
public Object aroundMethod(ProceedingJoinPoint joinPoint) throws Throwable {
//System.out.println("环绕通知>>>>>>>>>");
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
TenantLog log = method.getAnnotation(TenantLog.class);
if(log != null){
if (log != null) {
int opType = log.value();
Integer logType = null;
String content = null;
Integer tenantId = null;
//获取参数
Object[] args = joinPoint.getArgs();
if(args.length>0){
for(Object obj: args){
if(obj instanceof SysTenantPack){
if (args.length > 0) {
for (Object obj : args) {
if (obj instanceof SysTenantPack) {
// logType=3 租户操作日志
logType = CommonConstant.LOG_TYPE_3;
SysTenantPack pack = (SysTenantPack)obj;
if(opType==2){
content = "创建了角色权限 "+ pack.getPackName();
SysTenantPack pack = (SysTenantPack) obj;
if (opType == 2) {
content = "创建了角色权限 " + pack.getPackName();
}
tenantId = pack.getTenantId();
break;
}else if(obj instanceof SysTenantPackUser){
} else if (obj instanceof SysTenantPackUser) {
logType = CommonConstant.LOG_TYPE_3;
SysTenantPackUser packUser = (SysTenantPackUser)obj;
if(opType==2){
content = ""+packUser.getRealname()+" 添加到角色 "+ packUser.getPackName();
}else if(opType==4){
content = "移除了 "+packUser.getPackName()+" 成员 "+ packUser.getRealname();
SysTenantPackUser packUser = (SysTenantPackUser) obj;
if (opType == 2) {
content = "" + packUser.getRealname() + " 添加到角色 " + packUser.getPackName();
} else if (opType == 4) {
content = "移除了 " + packUser.getPackName() + " 成员 " + packUser.getRealname();
}
tenantId = packUser.getTenantId();
}
}
}
}
if(logType!=null){
if (logType != null) {
LogDTO dto = new LogDTO();
dto.setLogType(logType);
dto.setLogContent(content);
@@ -80,7 +80,7 @@ public class TenantPackUserLogAspect {
dto.setTenantId(tenantId);
//获取登录用户信息
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(sysUser!=null){
if (sysUser != null) {
dto.setUserid(sysUser.getUsername());
dto.setUsername(sysUser.getRealname());
@@ -94,7 +94,7 @@ public class TenantPackUserLogAspect {
}
@AfterThrowing("tenantLogPointCut()")
public void afterThrowing()throws Throwable{
public void afterThrowing() throws Throwable {
System.out.println("异常通知");
}
}

View File

@@ -20,6 +20,7 @@ import java.util.Set;
/**
* 服务化 system模块 对外接口请求类
*
* @author: jeecg-boot
*/
@Slf4j
@@ -34,47 +35,52 @@ public class SystemApiController {
/**
* 发送系统消息
*
* @param message 使用构造器赋值参数 如果不设置category(消息类型)则默认为2 发送系统消息
*/
@PostMapping("/sendSysAnnouncement")
public void sendSysAnnouncement(@RequestBody MessageDTO message){
public void sendSysAnnouncement(@RequestBody MessageDTO message) {
sysBaseApi.sendSysAnnouncement(message);
}
/**
* 发送消息 附带业务参数
*
* @param message 使用构造器赋值参数
*/
@PostMapping("/sendBusAnnouncement")
public void sendBusAnnouncement(@RequestBody BusMessageDTO message){
public void sendBusAnnouncement(@RequestBody BusMessageDTO message) {
sysBaseApi.sendBusAnnouncement(message);
}
/**
* 通过模板发送消息
*
* @param message 使用构造器赋值参数
*/
@PostMapping("/sendTemplateAnnouncement")
public void sendTemplateAnnouncement(@RequestBody TemplateMessageDTO message){
public void sendTemplateAnnouncement(@RequestBody TemplateMessageDTO message) {
sysBaseApi.sendTemplateAnnouncement(message);
}
/**
* 通过模板发送消息 附带业务参数
*
* @param message 使用构造器赋值参数
*/
@PostMapping("/sendBusTemplateAnnouncement")
public void sendBusTemplateAnnouncement(@RequestBody BusTemplateMessageDTO message){
public void sendBusTemplateAnnouncement(@RequestBody BusTemplateMessageDTO message) {
sysBaseApi.sendBusTemplateAnnouncement(message);
}
/**
* 通过消息中心模板,生成推送内容
*
* @param templateDTO 使用构造器赋值参数
* @return
*/
@PostMapping("/parseTemplateByCode")
public String parseTemplateByCode(@RequestBody TemplateDTO templateDTO){
public String parseTemplateByCode(@RequestBody TemplateDTO templateDTO) {
return sysBaseApi.parseTemplateByCode(templateDTO);
}
@@ -82,17 +88,18 @@ public class SystemApiController {
* 根据业务类型busType及业务busId修改消息已读
*/
@GetMapping("/updateSysAnnounReadFlag")
public void updateSysAnnounReadFlag(@RequestParam("busType") String busType, @RequestParam("busId")String busId){
public void updateSysAnnounReadFlag(@RequestParam("busType") String busType, @RequestParam("busId") String busId) {
sysBaseApi.updateSysAnnounReadFlag(busType, busId);
}
/**
* 根据用户账号查询用户信息
*
* @param username
* @return
*/
@GetMapping("/getUserByName")
public LoginUser getUserByName(@RequestParam("username") String username){
public LoginUser getUserByName(@RequestParam("username") String username) {
LoginUser loginUser = sysBaseApi.getUserByName(username);
//用户信息加密
try {
@@ -102,25 +109,27 @@ public class SystemApiController {
}
return loginUser;
}
/**
* 根据用户账号查询用户ID
*
* @param username
* @return
*/
@GetMapping("/getUserIdByName")
public String getUserIdByName(@RequestParam("username") String username){
public String getUserIdByName(@RequestParam("username") String username) {
String userId = sysBaseApi.getUserIdByName(username);
return userId;
}
/**
* 根据用户id查询用户信息
*
* @param id
* @return
*/
@GetMapping("/getUserById")
LoginUser getUserById(@RequestParam("id") String id){
LoginUser getUserById(@RequestParam("id") String id) {
LoginUser loginUser = sysBaseApi.getUserById(id);
//用户信息加密
try {
@@ -133,99 +142,110 @@ public class SystemApiController {
/**
* 通过用户账号查询角色集合
*
* @param username
* @return
*/
@GetMapping("/getRolesByUsername")
List<String> getRolesByUsername(@RequestParam("username") String username){
List<String> getRolesByUsername(@RequestParam("username") String username) {
return sysBaseApi.getRolesByUsername(username);
}
/**
* 通过用户账号查询角色集合
*
* @param userId
* @return
*/
@GetMapping("/getRolesByUserId")
List<String> getRolesByUserId(@RequestParam("userId") String userId){
List<String> getRolesByUserId(@RequestParam("userId") String userId) {
return sysBaseApi.getRolesByUserId(userId);
}
/**
* 通过用户账号查询部门集合
*
* @param username
* @return 部门 id
*/
@GetMapping("/getDepartIdsByUsername")
List<String> getDepartIdsByUsername(@RequestParam("username") String username){
List<String> getDepartIdsByUsername(@RequestParam("username") String username) {
return sysBaseApi.getDepartIdsByUsername(username);
}
/**
* 通过用户账号查询部门集合
*
* @param userId
* @return 部门 id
*/
@GetMapping("/getDepartIdsByUserId")
List<String> getDepartIdsByUserId(@RequestParam("userId") String userId){
List<String> getDepartIdsByUserId(@RequestParam("userId") String userId) {
return sysBaseApi.getDepartIdsByUserId(userId);
}
/**
* 通过用户账号查询部门父ID集合
*
* @param username
* @return 部门 id
*/
@GetMapping("/getDepartParentIdsByUsername")
Set<String> getDepartParentIdsByUsername(@RequestParam("username") String username){
Set<String> getDepartParentIdsByUsername(@RequestParam("username") String username) {
return sysBaseApi.getDepartParentIdsByUsername(username);
}
/**
* 查询部门父ID集合
*
* @param depIds
* @return 部门 id
*/
@GetMapping("/getDepartParentIdsByDepIds")
Set<String> getDepartParentIdsByDepIds(@RequestParam("depIds") Set<String> depIds){
Set<String> getDepartParentIdsByDepIds(@RequestParam("depIds") Set<String> depIds) {
return sysBaseApi.getDepartParentIdsByDepIds(depIds);
}
/**
* 通过用户账号查询部门 name
*
* @param username
* @return 部门 name
*/
@GetMapping("/getDepartNamesByUsername")
List<String> getDepartNamesByUsername(@RequestParam("username") String username){
List<String> getDepartNamesByUsername(@RequestParam("username") String username) {
return sysBaseApi.getDepartNamesByUsername(username);
}
/**
* 获取数据字典
*
* @param code
* @return
*/
@GetMapping("/queryDictItemsByCode")
List<DictModel> queryDictItemsByCode(@RequestParam("code") String code){
List<DictModel> queryDictItemsByCode(@RequestParam("code") String code) {
return sysBaseApi.queryDictItemsByCode(code);
}
/**
* 获取有效的数据字典
*
* @param code
* @return
*/
@GetMapping("/queryEnableDictItemsByCode")
List<DictModel> queryEnableDictItemsByCode(@RequestParam("code") String code){
List<DictModel> queryEnableDictItemsByCode(@RequestParam("code") String code) {
return sysBaseApi.queryEnableDictItemsByCode(code);
}
/** 查询所有的父级字典按照create_time排序 */
/**
* 查询所有的父级字典按照create_time排序
*/
@GetMapping("/queryAllDict")
List<DictModel> queryAllDict(){
List<DictModel> queryAllDict() {
// try{
// //睡10秒gateway网关5秒超时会触发熔断降级操作
// Thread.sleep(10000);
@@ -239,63 +259,69 @@ public class SystemApiController {
/**
* 查询所有分类字典
*
* @return
*/
@GetMapping("/queryAllSysCategory")
List<SysCategoryModel> queryAllSysCategory(){
List<SysCategoryModel> queryAllSysCategory() {
return sysBaseApi.queryAllSysCategory();
}
/**
* 查询所有部门 作为字典信息 id -->value,departName -->text
*
* @return
*/
@GetMapping("/queryAllDepartBackDictModel")
List<DictModel> queryAllDepartBackDictModel(){
List<DictModel> queryAllDepartBackDictModel() {
return sysBaseApi.queryAllDepartBackDictModel();
}
/**
* 获取所有角色 带参
* roleIds 默认选中角色
*
* @return
*/
@GetMapping("/queryAllRole")
public List<ComboModel> queryAllRole(@RequestParam(name = "roleIds",required = false)String[] roleIds){
if(roleIds==null || roleIds.length==0){
public List<ComboModel> queryAllRole(@RequestParam(name = "roleIds", required = false) String[] roleIds) {
if (roleIds == null || roleIds.length == 0) {
return sysBaseApi.queryAllRole();
}else{
} else {
return sysBaseApi.queryAllRole(roleIds);
}
}
/**
* 通过用户账号查询角色Id集合
*
* @param username
* @return
*/
@GetMapping("/getRoleIdsByUsername")
public List<String> getRoleIdsByUsername(@RequestParam("username")String username){
public List<String> getRoleIdsByUsername(@RequestParam("username") String username) {
return sysBaseApi.getRoleIdsByUsername(username);
}
/**
* 通过部门编号查询部门id
*
* @param orgCode
* @return
*/
@GetMapping("/getDepartIdsByOrgCode")
public String getDepartIdsByOrgCode(@RequestParam("orgCode")String orgCode){
public String getDepartIdsByOrgCode(@RequestParam("orgCode") String orgCode) {
return sysBaseApi.getDepartIdsByOrgCode(orgCode);
}
/**
* 查询所有部门
*
* @return
*/
@GetMapping("/getAllSysDepart")
public List<SysDepartModel> getAllSysDepart(){
public List<SysDepartModel> getAllSysDepart() {
return sysBaseApi.getAllSysDepart();
}
@@ -306,29 +332,30 @@ public class SystemApiController {
* @return
*/
@GetMapping("/getDynamicDbSourceById")
DynamicDataSourceModel getDynamicDbSourceById(@RequestParam("dbSourceId")String dbSourceId){
DynamicDataSourceModel getDynamicDbSourceById(@RequestParam("dbSourceId") String dbSourceId) {
return sysBaseApi.getDynamicDbSourceById(dbSourceId);
}
/**
* 根据部门Id获取部门负责人
*
* @param deptId
* @return
*/
@GetMapping("/getDeptHeadByDepId")
public List<String> getDeptHeadByDepId(@RequestParam("deptId") String deptId){
public List<String> getDeptHeadByDepId(@RequestParam("deptId") String deptId) {
return sysBaseApi.getDeptHeadByDepId(deptId);
}
/**
* 查找父级部门
*
* @param departId
* @return
*/
@GetMapping("/getParentDepartId")
public DictModel getParentDepartId(@RequestParam("departId")String departId){
public DictModel getParentDepartId(@RequestParam("departId") String departId) {
return sysBaseApi.getParentDepartId(departId);
}
@@ -339,17 +366,18 @@ public class SystemApiController {
* @return
*/
@GetMapping("/getDynamicDbSourceByCode")
public DynamicDataSourceModel getDynamicDbSourceByCode(@RequestParam("dbSourceCode") String dbSourceCode){
public DynamicDataSourceModel getDynamicDbSourceByCode(@RequestParam("dbSourceCode") String dbSourceCode) {
return sysBaseApi.getDynamicDbSourceByCode(dbSourceCode);
}
/**
* 给指定用户发消息
*
* @param userIds
* @param cmd
*/
@GetMapping("/sendWebSocketMsg")
public void sendWebSocketMsg(String[] userIds, String cmd){
public void sendWebSocketMsg(String[] userIds, String cmd) {
sysBaseApi.sendWebSocketMsg(userIds, cmd);
}
@@ -357,81 +385,88 @@ public class SystemApiController {
/**
* 根据id获取所有参与用户
* userIds
*
* @return
*/
@GetMapping("/queryAllUserByIds")
public List<UserAccountInfo> queryAllUserByIds(@RequestParam("userIds") String[] userIds){
public List<UserAccountInfo> queryAllUserByIds(@RequestParam("userIds") String[] userIds) {
return sysBaseApi.queryAllUserByIds(userIds);
}
/**
* 查询所有用户 返回ComboModel
*
* @return
*/
@GetMapping("/queryAllUserBackCombo")
public List<ComboModel> queryAllUserBackCombo(){
public List<ComboModel> queryAllUserBackCombo() {
return sysBaseApi.queryAllUserBackCombo();
}
/**
* 分页查询用户 返回JSONObject
*
* @return
*/
@GetMapping("/queryAllUser")
public JSONObject queryAllUser(@RequestParam(name="userIds",required=false)String userIds, @RequestParam(name="pageNo",required=false) Integer pageNo,@RequestParam(name="pageSize",required=false) Integer pageSize){
public JSONObject queryAllUser(@RequestParam(name = "userIds", required = false) String userIds, @RequestParam(name = "pageNo", required = false) Integer pageNo, @RequestParam(name = "pageSize", required = false) Integer pageSize) {
return sysBaseApi.queryAllUser(userIds, pageNo, pageSize);
}
/**
* 将会议签到信息推动到预览
* userIds
* @return
*
* @param userId
* @return
*/
@GetMapping("/meetingSignWebsocket")
public void meetingSignWebsocket(@RequestParam("userId")String userId){
public void meetingSignWebsocket(@RequestParam("userId") String userId) {
sysBaseApi.meetingSignWebsocket(userId);
}
/**
* 根据name获取所有参与用户
* userNames
*
* @return
*/
@GetMapping("/queryUserByNames")
public List<UserAccountInfo> queryUserByNames(@RequestParam("userNames")String[] userNames){
public List<UserAccountInfo> queryUserByNames(@RequestParam("userNames") String[] userNames) {
return sysBaseApi.queryUserByNames(userNames);
}
/**
* 获取用户的角色集合
*
* @param username
* @return
*/
@GetMapping("/getUserRoleSet")
public Set<String> getUserRoleSet(@RequestParam("username")String username){
public Set<String> getUserRoleSet(@RequestParam("username") String username) {
return sysBaseApi.getUserRoleSet(username);
}
/**
* 获取用户的角色集合
*
* @param userId
* @return
*/
@GetMapping("/getUserRoleSetById")
public Set<String> getUserRoleSetById(@RequestParam("userId")String userId){
public Set<String> getUserRoleSetById(@RequestParam("userId") String userId) {
return sysBaseApi.getUserRoleSetById(userId);
}
/**
* 获取用户的权限集合
*
* @param userId 用户表ID
* @return
*/
@GetMapping("/getUserPermissionSet")
public Set<String> getUserPermissionSet(@RequestParam("userId") String userId){
public Set<String> getUserPermissionSet(@RequestParam("userId") String userId) {
return sysBaseApi.getUserPermissionSet(userId);
}
@@ -439,42 +474,46 @@ public class SystemApiController {
/**
* 判断是否有online访问的权限
*
* @param onlineAuthDTO
* @return
*/
@PostMapping("/hasOnlineAuth")
public boolean hasOnlineAuth(@RequestBody OnlineAuthDTO onlineAuthDTO){
public boolean hasOnlineAuth(@RequestBody OnlineAuthDTO onlineAuthDTO) {
return sysBaseApi.hasOnlineAuth(onlineAuthDTO);
}
/**
* 查询用户角色信息
*
* @param username
* @return
*/
@GetMapping("/queryUserRoles")
public Set<String> queryUserRoles(@RequestParam("username") String username){
public Set<String> queryUserRoles(@RequestParam("username") String username) {
return sysUserService.getUserRolesSet(username);
}
/**
* 查询用户角色信息
*
* @param userId
* @return
*/
@GetMapping("/queryUserRolesById")
public Set<String> queryUserRolesById(@RequestParam("userId") String userId){
public Set<String> queryUserRolesById(@RequestParam("userId") String userId) {
return sysUserService.getUserRoleSetById(userId);
}
/**
* 查询用户权限信息
*
* @param userId
* @return
*/
@GetMapping("/queryUserAuths")
public Set<String> queryUserAuths(@RequestParam("userId") String userId){
public Set<String> queryUserAuths(@RequestParam("userId") String userId) {
return sysUserService.getUserPermissionsSet(userId);
}
@@ -482,109 +521,122 @@ public class SystemApiController {
* 通过部门id获取部门全部信息
*/
@GetMapping("/selectAllById")
public SysDepartModel selectAllById(@RequestParam("id") String id){
public SysDepartModel selectAllById(@RequestParam("id") String id) {
return sysBaseApi.selectAllById(id);
}
/**
* 根据用户id查询用户所属公司下所有用户ids
*
* @param userId
* @return
*/
@GetMapping("/queryDeptUsersByUserId")
public List<String> queryDeptUsersByUserId(@RequestParam("userId") String userId){
public List<String> queryDeptUsersByUserId(@RequestParam("userId") String userId) {
return sysBaseApi.queryDeptUsersByUserId(userId);
}
/**
* 查询数据权限
*
* @return
*/
@GetMapping("/queryPermissionDataRule")
public List<SysPermissionDataRuleModel> queryPermissionDataRule(@RequestParam("component") String component, @RequestParam("requestPath")String requestPath, @RequestParam("username") String username){
public List<SysPermissionDataRuleModel> queryPermissionDataRule(@RequestParam("component") String component, @RequestParam("requestPath") String requestPath, @RequestParam("username") String username) {
return sysBaseApi.queryPermissionDataRule(component, requestPath, username);
}
/**
* 查询用户信息
*
* @param username
* @return
*/
@GetMapping("/getCacheUser")
public SysUserCacheInfo getCacheUser(@RequestParam("username") String username){
public SysUserCacheInfo getCacheUser(@RequestParam("username") String username) {
return sysBaseApi.getCacheUser(username);
}
/**
* 普通字典的翻译
*
* @param code
* @param key
* @return
*/
@GetMapping("/translateDict")
public String translateDict(@RequestParam("code") String code, @RequestParam("key") String key){
public String translateDict(@RequestParam("code") String code, @RequestParam("key") String key) {
return sysBaseApi.translateDict(code, key);
}
/**
* 36根据多个用户账号(逗号分隔),查询返回多个用户信息
*
* @param usernames
* @return
*/
@RequestMapping("/queryUsersByUsernames")
List<JSONObject> queryUsersByUsernames(@RequestParam("usernames") String usernames){
List<JSONObject> queryUsersByUsernames(@RequestParam("usernames") String usernames) {
return this.sysBaseApi.queryUsersByUsernames(usernames);
}
/**
* 37根据多个用户id(逗号分隔),查询返回多个用户信息
*
* @param ids
* @return
*/
@RequestMapping("/queryUsersByIds")
List<JSONObject> queryUsersByIds(@RequestParam("ids") String ids){
List<JSONObject> queryUsersByIds(@RequestParam("ids") String ids) {
return this.sysBaseApi.queryUsersByIds(ids);
}
/**
* 38根据多个部门编码(逗号分隔),查询返回多个部门信息
*
* @param orgCodes
* @return
*/
@GetMapping("/queryDepartsByOrgcodes")
List<JSONObject> queryDepartsByOrgcodes(@RequestParam("orgCodes") String orgCodes){
List<JSONObject> queryDepartsByOrgcodes(@RequestParam("orgCodes") String orgCodes) {
return this.sysBaseApi.queryDepartsByOrgcodes(orgCodes);
}
/**
* 39根据多个部门ID(逗号分隔),查询返回多个部门信息
*
* @param ids
* @return
*/
@GetMapping("/queryDepartsByIds")
List<JSONObject> queryDepartsByIds(@RequestParam("ids") String ids){
List<JSONObject> queryDepartsByIds(@RequestParam("ids") String ids) {
return this.sysBaseApi.queryDepartsByIds(ids);
}
/**
* 40发送邮件消息
*
* @param email
* @param title
* @param content
*/
@GetMapping("/sendEmailMsg")
public void sendEmailMsg(@RequestParam("email")String email,@RequestParam("title")String title,@RequestParam("content")String content){
this.sysBaseApi.sendEmailMsg(email,title,content);
};
public void sendEmailMsg(@RequestParam("email") String email, @RequestParam("title") String title, @RequestParam("content") String content) {
this.sysBaseApi.sendEmailMsg(email, title, content);
}
;
/**
* 41 获取公司下级部门和公司下所有用户信息
*
* @param orgCode
*/
@GetMapping("/getDeptUserByOrgCode")
List<Map> getDeptUserByOrgCode(@RequestParam("orgCode")String orgCode){
return this.sysBaseApi.getDeptUserByOrgCode(orgCode);
List<Map> getDeptUserByOrgCode(@RequestParam("orgCode") String orgCode) {
return this.sysBaseApi.getDeptUserByOrgCode(orgCode);
}
/**
@@ -633,7 +685,7 @@ public class SystemApiController {
Map<String, String> copyLowAppDict(@RequestParam("originalAppId") String originalAppId, @RequestParam("appId") String appId, @RequestParam("tenantId") String tenantId) {
return sysBaseApi.copyLowAppDict(originalAppId, appId, tenantId);
}
/**
* 根据字典code查询字典项
*
@@ -672,30 +724,33 @@ public class SystemApiController {
/**
* 48 普通字典的翻译根据多个dictCode和多条数据多个以逗号分割
*
* @param dictCodes
* @param keys
* @return
*/
@GetMapping("/translateManyDict")
public Map<String, List<DictModel>> translateManyDict(@RequestParam("dictCodes") String dictCodes, @RequestParam("keys") String keys){
public Map<String, List<DictModel>> translateManyDict(@RequestParam("dictCodes") String dictCodes, @RequestParam("keys") String keys) {
return this.sysBaseApi.translateManyDict(dictCodes, keys);
}
/**
* 获取表数据字典 【接口签名验证】
*
* @param tableFilterSql 表名可以带where条件
* @param text
* @param code
* @return
*/
@GetMapping("/queryTableDictItemsByCode")
List<DictModel> queryTableDictItemsByCode(@RequestParam("tableFilterSql") String tableFilterSql, @RequestParam("text") String text, @RequestParam("code") String code){
List<DictModel> queryTableDictItemsByCode(@RequestParam("tableFilterSql") String tableFilterSql, @RequestParam("text") String text, @RequestParam("code") String code) {
return sysBaseApi.queryTableDictItemsByCode(tableFilterSql, text, code);
}
/**
* 查询表字典 支持过滤数据 【接口签名验证】
*
* @param table
* @param text
* @param code
@@ -703,13 +758,14 @@ public class SystemApiController {
* @return
*/
@GetMapping("/queryFilterTableDictInfo")
List<DictModel> queryFilterTableDictInfo(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("filterSql") String filterSql){
List<DictModel> queryFilterTableDictInfo(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("filterSql") String filterSql) {
return sysBaseApi.queryFilterTableDictInfo(table, text, code, filterSql);
}
/**
* 【接口签名验证】
* 查询指定table的 text code 获取字典包含text和value
*
* @param table
* @param text
* @param code
@@ -718,13 +774,14 @@ public class SystemApiController {
*/
@Deprecated
@GetMapping("/queryTableDictByKeys")
public List<String> queryTableDictByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keyArray") String[] keyArray){
public List<String> queryTableDictByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keyArray") String[] keyArray) {
return sysBaseApi.queryTableDictByKeys(table, text, code, keyArray);
}
/**
* 字典表的 翻译【接口签名验证】
*
* @param table
* @param text
* @param code
@@ -732,12 +789,13 @@ public class SystemApiController {
* @return
*/
@GetMapping("/translateDictFromTable")
public String translateDictFromTable(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("key") String key){
public String translateDictFromTable(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("key") String key) {
return sysBaseApi.translateDictFromTable(table, text, code, key);
}
//update-begin---author:chenrui ---date:20231221 for[issues/#5643]解决分布式下表字典跨库无法查询问题------------
/**
* 【接口签名验证】
* 49 字典表的 翻译,可批量
@@ -746,60 +804,65 @@ public class SystemApiController {
* @param text
* @param code
* @param keys 多个用逗号分割
* @param ds 数据源
* @param ds 数据源
* @return
*/
@GetMapping("/translateDictFromTableByKeys")
public List<DictModel> translateDictFromTableByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keys") String keys, @RequestParam("ds") String ds) {
public List<DictModel> translateDictFromTableByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keys") String keys, @RequestParam("ds") String ds) {
return this.sysBaseApi.translateDictFromTableByKeys(table, text, code, keys, ds);
}
//update-end---author:chenrui ---date:20231221 for[issues/#5643]解决分布式下表字典跨库无法查询问题------------
/**
* 发送模板信息
*
* @param message
*/
@PostMapping("/sendTemplateMessage")
public void sendTemplateMessage(@RequestBody MessageDTO message){
public void sendTemplateMessage(@RequestBody MessageDTO message) {
sysBaseApi.sendTemplateMessage(message);
}
/**
* 获取消息模板内容
*
* @param code
* @return
*/
@GetMapping("/getTemplateContent")
public String getTemplateContent(@RequestParam("code") String code){
public String getTemplateContent(@RequestParam("code") String code) {
return this.sysBaseApi.getTemplateContent(code);
}
/**
* 保存数据日志
*
* @param dataLogDto
*/
@PostMapping("/saveDataLog")
public void saveDataLog(@RequestBody DataLogDTO dataLogDto){
public void saveDataLog(@RequestBody DataLogDTO dataLogDto) {
this.sysBaseApi.saveDataLog(dataLogDto);
}
/**
* 更新头像
*
* @param loginUser
* @return
*/
@PutMapping("/updateAvatar")
public void updateAvatar(@RequestBody LoginUser loginUser){
public void updateAvatar(@RequestBody LoginUser loginUser) {
this.sysBaseApi.updateAvatar(loginUser);
}
/**
* 向app端 websocket推送聊天刷新消息
*
* @param userId
* @return
*/
@GetMapping("/sendAppChatSocket")
public void sendAppChatSocket(@RequestParam(name="userId") String userId){
public void sendAppChatSocket(@RequestParam(name = "userId") String userId) {
this.sysBaseApi.sendAppChatSocket(userId);
}
@@ -816,26 +879,28 @@ public class SystemApiController {
/**
* 获取消息模板内容
*
* @param id
* @return
*/
@GetMapping("/getRoleCode")
public String getRoleCode(@RequestParam("id") String id){
public String getRoleCode(@RequestParam("id") String id) {
return this.sysBaseApi.getRoleCodeById(id);
}
/**
* VUEN-2584【issue】平台sql注入漏洞几个问题
* 部分特殊函数 可以将查询结果混夹在错误信息中,导致数据库的信息暴露
*
* @param e
* @return
*/
@ExceptionHandler(java.sql.SQLException.class)
public Result<?> handleSQLException(Exception e){
public Result<?> handleSQLException(Exception e) {
String msg = e.getMessage();
String extractvalue = "extractvalue";
String updatexml = "updatexml";
if(msg!=null && (msg.toLowerCase().indexOf(extractvalue)>=0 || msg.toLowerCase().indexOf(updatexml)>=0)){
if (msg != null && (msg.toLowerCase().indexOf(extractvalue) >= 0 || msg.toLowerCase().indexOf(updatexml) >= 0)) {
return Result.error("校验失败sql解析异常");
}
return Result.error("校验失败sql解析异常" + msg);
@@ -843,96 +908,105 @@ public class SystemApiController {
/**
* 根据高级查询条件查询用户
*
* @param superQuery
* @param matchType
* @return
*/
@GetMapping("/queryUserBySuperQuery")
public List<JSONObject> queryUserBySuperQuery(@RequestParam("superQuery") String superQuery, @RequestParam("matchType") String matchType) {
return sysBaseApi.queryUserBySuperQuery(superQuery,matchType);
public List<JSONObject> queryUserBySuperQuery(@RequestParam("superQuery") String superQuery, @RequestParam("matchType") String matchType) {
return sysBaseApi.queryUserBySuperQuery(superQuery, matchType);
}
/**
* 根据id条件查询用户
*
* @param id
* @return
*/
@GetMapping("/queryUserById")
public JSONObject queryUserById(@RequestParam("id") String id) {
public JSONObject queryUserById(@RequestParam("id") String id) {
return sysBaseApi.queryUserById(id);
}
/**
* 根据高级查询条件查询部门
*
* @param superQuery
* @param matchType
* @return
*/
@GetMapping("/queryDeptBySuperQuery")
public List<JSONObject> queryDeptBySuperQuery(@RequestParam("superQuery") String superQuery, @RequestParam("matchType") String matchType) {
return sysBaseApi.queryDeptBySuperQuery(superQuery,matchType);
public List<JSONObject> queryDeptBySuperQuery(@RequestParam("superQuery") String superQuery, @RequestParam("matchType") String matchType) {
return sysBaseApi.queryDeptBySuperQuery(superQuery, matchType);
}
/**
* 根据高级查询条件查询角色
*
* @param superQuery
* @param matchType
* @return
*/
@GetMapping("/queryRoleBySuperQuery")
public List<JSONObject> queryRoleBySuperQuery(@RequestParam("superQuery") String superQuery, @RequestParam("matchType") String matchType) {
return sysBaseApi.queryRoleBySuperQuery(superQuery,matchType);
public List<JSONObject> queryRoleBySuperQuery(@RequestParam("superQuery") String superQuery, @RequestParam("matchType") String matchType) {
return sysBaseApi.queryRoleBySuperQuery(superQuery, matchType);
}
/**
* 根据租户ID查询用户ID
*
* @param tenantId 租户ID
* @return List<String>
*/
@GetMapping("/selectUserIdByTenantId")
public List<String> selectUserIdByTenantId(@RequestParam("tenantId") String tenantId) {
public List<String> selectUserIdByTenantId(@RequestParam("tenantId") String tenantId) {
return sysBaseApi.selectUserIdByTenantId(tenantId);
}
/**
* 根据部门ID查询用户ID
*
* @param deptIds
* @return
*/
@GetMapping("/queryUserIdsByDeptIds")
public List<String> queryUserIdsByDeptIds(@RequestParam("deptIds") List<String> deptIds){
public List<String> queryUserIdsByDeptIds(@RequestParam("deptIds") List<String> deptIds) {
return sysBaseApi.queryUserIdsByDeptIds(deptIds);
}
/**
* 根据部门ID查询用户ID
*
* @param deptIds
* @return
*/
@GetMapping("/queryUserAccountsByDeptIds")
public List<String> queryUserAccountsByDeptIds(@RequestParam("deptIds") List<String> deptIds){
public List<String> queryUserAccountsByDeptIds(@RequestParam("deptIds") List<String> deptIds) {
return sysBaseApi.queryUserAccountsByDeptIds(deptIds);
}
/**
* 根据角色编码 查询用户ID
*
* @param roleCodes
* @return
*/
@GetMapping("/queryUserIdsByRoleds")
public List<String> queryUserIdsByRoleds(@RequestParam("roleCodes") List<String> roleCodes){
public List<String> queryUserIdsByRoleds(@RequestParam("roleCodes") List<String> roleCodes) {
return sysBaseApi.queryUserIdsByRoleds(roleCodes);
}
/**
* 根据职务ID查询用户ID
*
* @param positionIds
* @return
*/
@GetMapping("/queryUserIdsByPositionIds")
public List<String> queryUserIdsByPositionIds(@RequestParam("positionIds") List<String> positionIds){
public List<String> queryUserIdsByPositionIds(@RequestParam("positionIds") List<String> positionIds) {
return sysBaseApi.queryUserIdsByPositionIds(positionIds);
}
@@ -944,7 +1018,7 @@ public class SystemApiController {
* @return
*/
@GetMapping("/getUserAccountsByDepCode")
public List<String> getUserAccountsByDepCode(@RequestParam("orgCode") String orgCode){
public List<String> getUserAccountsByDepCode(@RequestParam("orgCode") String orgCode) {
return sysBaseApi.getUserAccountsByDepCode(orgCode);
}

View File

@@ -1,10 +1,9 @@
package org.jeecg.modules.cas.controller;
import java.util.List;
import com.alibaba.fastjson.JSONObject;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
@@ -24,9 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
* <p>
@@ -41,71 +38,71 @@ import lombok.extern.slf4j.Slf4j;
@RequestMapping("/sys/cas/client")
public class CasClientController {
@Autowired
private ISysUserService sysUserService;
@Autowired
@Autowired
private ISysUserService sysUserService;
@Autowired
private ISysDepartService sysDepartService;
@Autowired
@Autowired
private RedisUtil redisUtil;
@Value("${cas.prefixUrl}")
@Value("${cas.prefixUrl}")
private String prefixUrl;
@GetMapping("/validateLogin")
public Object validateLogin(@RequestParam(name="ticket") String ticket,
@RequestParam(name="service") String service,
HttpServletRequest request,
HttpServletResponse response) throws Exception {
Result<JSONObject> result = new Result<JSONObject>();
log.info("Rest api login.");
try {
String validateUrl = prefixUrl+"/p3/serviceValidate";
String res = CasServiceUtil.getStValidate(validateUrl, ticket, service);
log.info("res."+res);
final String error = XmlUtils.getTextForElement(res, "authenticationFailure");
if(StringUtils.isNotEmpty(error)) {
throw new Exception(error);
}
final String principal = XmlUtils.getTextForElement(res, "user");
if (StringUtils.isEmpty(principal)) {
throw new Exception("No principal was found in the response from the CAS server.");
}
log.info("-------token----username---"+principal);
//1. 校验用户是否有效
SysUser sysUser = sysUserService.getUserByName(principal);
result = sysUserService.checkUserIsEffective(sysUser);
if(!result.isSuccess()) {
return result;
}
String token = JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword());
// 设置超时时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000);
//获取用户部门信息
JSONObject obj = new JSONObject();
List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
obj.put("departs", departs);
if (departs == null || departs.size() == 0) {
obj.put("multi_depart", 0);
} else if (departs.size() == 1) {
sysUserService.updateUserDepart(principal, departs.get(0).getOrgCode(),null);
obj.put("multi_depart", 1);
} else {
obj.put("multi_depart", 2);
}
obj.put("token", token);
obj.put("userInfo", sysUser);
result.setResult(obj);
result.success("登录成功");
} catch (Exception e) {
//e.printStackTrace();
result.error500(e.getMessage());
}
return new HttpEntity<>(result);
}
@GetMapping("/validateLogin")
public Object validateLogin(@RequestParam(name = "ticket") String ticket,
@RequestParam(name = "service") String service,
HttpServletRequest request,
HttpServletResponse response) throws Exception {
Result<JSONObject> result = new Result<JSONObject>();
log.info("Rest api login.");
try {
String validateUrl = prefixUrl + "/p3/serviceValidate";
String res = CasServiceUtil.getStValidate(validateUrl, ticket, service);
log.info("res." + res);
final String error = XmlUtils.getTextForElement(res, "authenticationFailure");
if (StringUtils.isNotEmpty(error)) {
throw new Exception(error);
}
final String principal = XmlUtils.getTextForElement(res, "user");
if (StringUtils.isEmpty(principal)) {
throw new Exception("No principal was found in the response from the CAS server.");
}
log.info("-------token----username---" + principal);
//1. 校验用户是否有效
SysUser sysUser = sysUserService.getUserByName(principal);
result = sysUserService.checkUserIsEffective(sysUser);
if (!result.isSuccess()) {
return result;
}
String token = JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword());
// 设置超时时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
//获取用户部门信息
JSONObject obj = new JSONObject();
List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
obj.put("departs", departs);
if (departs == null || departs.size() == 0) {
obj.put("multi_depart", 0);
} else if (departs.size() == 1) {
sysUserService.updateUserDepart(principal, departs.get(0).getOrgCode(), null);
obj.put("multi_depart", 1);
} else {
obj.put("multi_depart", 2);
}
obj.put("token", token);
obj.put("userInfo", sysUser);
result.setResult(obj);
result.success("登录成功");
} catch (Exception e) {
//e.printStackTrace();
result.error500(e.getMessage());
}
return new HttpEntity<>(result);
}
}

View File

@@ -1,14 +1,5 @@
package org.jeecg.modules.cas.util;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.security.cert.X509Certificate;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
@@ -16,40 +7,48 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.security.cert.X509Certificate;
/**
* @Description: CasServiceUtil
* @author: jeecg-boot
*/
public class CasServiceUtil {
public static void main(String[] args) {
String serviceUrl = "https://cas.8f8.com.cn:8443/cas/p3/serviceValidate";
String service = "http://localhost:3003/user/login";
String ticket = "ST-5-1g-9cNES6KXNRwq-GuRET103sm0-DESKTOP-VKLS8B3";
String res = getStValidate(serviceUrl,ticket, service);
System.out.println("---------res-----"+res);
}
/**
public static void main(String[] args) {
String serviceUrl = "https://cas.8f8.com.cn:8443/cas/p3/serviceValidate";
String service = "http://localhost:3003/user/login";
String ticket = "ST-5-1g-9cNES6KXNRwq-GuRET103sm0-DESKTOP-VKLS8B3";
String res = getStValidate(serviceUrl, ticket, service);
System.out.println("---------res-----" + res);
}
/**
* 验证ST
*/
public static String getStValidate(String url, String st, String service){
try {
url = url+"?service="+service+"&ticket="+st;
CloseableHttpClient httpclient = createHttpClientWithNoSsl();
HttpGet httpget = new HttpGet(url);
HttpResponse response = httpclient.execute(httpget);
String res = readResponse(response);
return res == null ? null : (res == "" ? null : res);
} catch (Exception e) {
e.printStackTrace();
}
return "";
}
public static String getStValidate(String url, String st, String service) {
try {
url = url + "?service=" + service + "&ticket=" + st;
CloseableHttpClient httpclient = createHttpClientWithNoSsl();
HttpGet httpget = new HttpGet(url);
HttpResponse response = httpclient.execute(httpget);
String res = readResponse(response);
return res == null ? null : (res == "" ? null : res);
} catch (Exception e) {
e.printStackTrace();
}
return "";
}
/**
* 读取 response body 内容为字符串
*
@@ -66,8 +65,8 @@ public class CasServiceUtil {
}
return result;
}
/**
* 创建模拟客户端(针对 https 客户端禁用 SSL 验证)
*

View File

@@ -1,20 +1,7 @@
package org.jeecg.modules.cas.util;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.jeecg.common.constant.CommonConstant;
import lombok.extern.slf4j.Slf4j;
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -22,10 +9,17 @@ import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
import lombok.extern.slf4j.Slf4j;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.StringReader;
import java.util.*;
/**
* 解析cas,ST验证后的xml
*
* @author: jeecg-boot
*/
@Slf4j
@@ -40,7 +34,6 @@ public final class XmlUtils {
* Creates a new namespace-aware DOM document object by parsing the given XML.
*
* @param xml XML content.
*
* @return DOM document.
*/
public static Document newDocument(final String xml) {
@@ -189,8 +182,8 @@ public final class XmlUtils {
return builder.toString();
}
public static Map<String, Object> extractCustomAttributes(final String xml) {
final SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
@@ -203,11 +196,11 @@ public final class XmlUtils {
xmlReader.parse(new InputSource(new StringReader(xml)));
return handler.getAttributes();
} catch (final Exception e) {
log.error(e.getMessage(), e);
log.error(e.getMessage(), e);
return Collections.emptyMap();
}
}
private static class CustomAttributeHandler extends DefaultHandler {
private Map<String, Object> attributes;
@@ -270,35 +263,35 @@ public final class XmlUtils {
return this.attributes;
}
}
public static void main(String[] args) {
String result = "<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas'>\r\n" +
" <cas:authenticationSuccess>\r\n" +
" <cas:user>admin</cas:user>\r\n" +
" <cas:attributes>\r\n" +
" <cas:credentialType>UsernamePasswordCredential</cas:credentialType>\r\n" +
" <cas:isFromNewLogin>true</cas:isFromNewLogin>\r\n" +
" <cas:authenticationDate>2019-08-01T19:33:21.527+08:00[Asia/Shanghai]</cas:authenticationDate>\r\n" +
" <cas:authenticationMethod>RestAuthenticationHandler</cas:authenticationMethod>\r\n" +
" <cas:successfulAuthenticationHandlers>RestAuthenticationHandler</cas:successfulAuthenticationHandlers>\r\n" +
" <cas:longTermAuthenticationRequestTokenUsed>false</cas:longTermAuthenticationRequestTokenUsed>\r\n" +
" </cas:attributes>\r\n" +
" </cas:authenticationSuccess>\r\n" +
"</cas:serviceResponse>";
String errorRes = "<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas'>\r\n" +
" <cas:authenticationFailure code=\"INVALID_TICKET\">未能够识别出目标 &#39;ST-5-1g-9cNES6KXNRwq-GuRET103sm0-DESKTOP-VKLS8B3&#39;票根</cas:authenticationFailure>\r\n" +
"</cas:serviceResponse>";
String error = XmlUtils.getTextForElement(errorRes, "authenticationFailure");
System.out.println("------"+error);
String error2 = XmlUtils.getTextForElement(result, "authenticationFailure");
System.out.println("------"+error2);
String principal = XmlUtils.getTextForElement(result, "user");
System.out.println("---principal---"+principal);
Map<String, Object> attributes = XmlUtils.extractCustomAttributes(result);
System.out.println("---attributes---"+attributes);
}
String result = "<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas'>\r\n" +
" <cas:authenticationSuccess>\r\n" +
" <cas:user>admin</cas:user>\r\n" +
" <cas:attributes>\r\n" +
" <cas:credentialType>UsernamePasswordCredential</cas:credentialType>\r\n" +
" <cas:isFromNewLogin>true</cas:isFromNewLogin>\r\n" +
" <cas:authenticationDate>2019-08-01T19:33:21.527+08:00[Asia/Shanghai]</cas:authenticationDate>\r\n" +
" <cas:authenticationMethod>RestAuthenticationHandler</cas:authenticationMethod>\r\n" +
" <cas:successfulAuthenticationHandlers>RestAuthenticationHandler</cas:successfulAuthenticationHandlers>\r\n" +
" <cas:longTermAuthenticationRequestTokenUsed>false</cas:longTermAuthenticationRequestTokenUsed>\r\n" +
" </cas:attributes>\r\n" +
" </cas:authenticationSuccess>\r\n" +
"</cas:serviceResponse>";
String errorRes = "<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas'>\r\n" +
" <cas:authenticationFailure code=\"INVALID_TICKET\">未能够识别出目标 &#39;ST-5-1g-9cNES6KXNRwq-GuRET103sm0-DESKTOP-VKLS8B3&#39;票根</cas:authenticationFailure>\r\n" +
"</cas:serviceResponse>";
String error = XmlUtils.getTextForElement(errorRes, "authenticationFailure");
System.out.println("------" + error);
String error2 = XmlUtils.getTextForElement(result, "authenticationFailure");
System.out.println("------" + error2);
String principal = XmlUtils.getTextForElement(result, "user");
System.out.println("---principal---" + principal);
Map<String, Object> attributes = XmlUtils.extractCustomAttributes(result);
System.out.println("---attributes---" + attributes);
}
}

View File

@@ -2,7 +2,7 @@ package org.jeecg.modules.database.constant;
public interface ExperimentStatus {
String PRE_TEST="试验前";
String PROGRESSING="试验进行中";
String COMPLETED="试验完成";
String PRE_TEST = "试验前";
String PROGRESSING = "试验进行中";
String COMPLETED = "试验完成";
}

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.Client;
import org.jeecg.modules.database.service.IClientService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.Client;
import org.jeecg.modules.database.service.IClientService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 委托方
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="委托方")
@Tag(name = "委托方")
@RestController
@RequestMapping("/database/client")
@Slf4j
public class ClientController extends JeecgController<Client, IClientService> {
@Autowired
private IClientService clientService;
/**
* 分页列表查询
*
* @param client
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "委托方-分页列表查询")
@Operation(summary="委托方-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Client>> queryPageList(Client client,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Client> queryWrapper = QueryGenerator.initQueryWrapper(client, req.getParameterMap());
Page<Client> page = new Page<Client>(pageNo, pageSize);
IPage<Client> pageList = clientService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param client
* @return
*/
@AutoLog(value = "委托方-添加")
@Operation(summary="委托方-添加")
@RequiresPermissions("database:client:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody Client client) {
clientService.save(client);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param client
* @return
*/
@AutoLog(value = "委托方-编辑")
@Operation(summary="委托方-编辑")
@RequiresPermissions("database:client:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody Client client) {
clientService.updateById(client);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "委托方-通过id删除")
@Operation(summary="委托方-通过id删除")
@RequiresPermissions("database:client:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
clientService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "委托方-批量删除")
@Operation(summary="委托方-批量删除")
@RequiresPermissions("database:client:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.clientService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "委托方-通过id查询")
@Operation(summary="委托方-通过id查询")
@GetMapping(value = "/queryById")
public Result<Client> queryById(@RequestParam(name="id",required=true) String id) {
Client client = clientService.getById(id);
if(client==null) {
return Result.error("未找到对应数据");
}
return Result.OK(client);
}
@Autowired
private IClientService clientService;
/**
* 导出excel
*
* @param request
* @param client
*/
* 分页列表查询
*
* @param client
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "委托方-分页列表查询")
@Operation(summary = "委托方-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Client>> queryPageList(Client client,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Client> queryWrapper = QueryGenerator.initQueryWrapper(client, req.getParameterMap());
Page<Client> page = new Page<Client>(pageNo, pageSize);
IPage<Client> pageList = clientService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param client
* @return
*/
@AutoLog(value = "委托方-添加")
@Operation(summary = "委托方-添加")
@RequiresPermissions("database:client:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody Client client) {
clientService.save(client);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param client
* @return
*/
@AutoLog(value = "委托方-编辑")
@Operation(summary = "委托方-编辑")
@RequiresPermissions("database:client:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody Client client) {
clientService.updateById(client);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "委托方-通过id删除")
@Operation(summary = "委托方-通过id删除")
@RequiresPermissions("database:client:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
clientService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "委托方-批量删除")
@Operation(summary = "委托方-批量删除")
@RequiresPermissions("database:client:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.clientService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "委托方-通过id查询")
@Operation(summary = "委托方-通过id查询")
@GetMapping(value = "/queryById")
public Result<Client> queryById(@RequestParam(name = "id", required = true) String id) {
Client client = clientService.getById(id);
if (client == null) {
return Result.error("未找到对应数据");
}
return Result.OK(client);
}
/**
* 导出excel
*
* @param request
* @param client
*/
@RequiresPermissions("database:client:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Client client) {
@@ -163,12 +147,12 @@ public class ClientController extends JeecgController<Client, IClientService> {
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:client:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.CnasTest;
import org.jeecg.modules.database.service.ICnasTestService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.CnasTest;
import org.jeecg.modules.database.service.ICnasTestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: cnas测试参数列表
* @Author: jeecg-boot
* @Date: 2024-10-23
* @Date: 2024-10-23
* @Version: V1.0
*/
@Tag(name="cnas测试参数列表")
@Tag(name = "cnas测试参数列表")
@RestController
@RequestMapping("/database/cnasTest")
@Slf4j
public class CnasTestController extends JeecgController<CnasTest, ICnasTestService> {
@Autowired
private ICnasTestService cnasTestService;
/**
* 分页列表查询
*
* @param cnasTest
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "cnas测试参数列表-分页列表查询")
@Operation(summary="cnas测试参数列表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<CnasTest>> queryPageList(CnasTest cnasTest,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CnasTest> queryWrapper = QueryGenerator.initQueryWrapper(cnasTest, req.getParameterMap());
Page<CnasTest> page = new Page<CnasTest>(pageNo, pageSize);
IPage<CnasTest> pageList = cnasTestService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param cnasTest
* @return
*/
@AutoLog(value = "cnas测试参数列表-添加")
@Operation(summary="cnas测试参数列表-添加")
@RequiresPermissions("database:cnas_test:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CnasTest cnasTest) {
cnasTestService.save(cnasTest);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param cnasTest
* @return
*/
@AutoLog(value = "cnas测试参数列表-编辑")
@Operation(summary="cnas测试参数列表-编辑")
@RequiresPermissions("database:cnas_test:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody CnasTest cnasTest) {
cnasTestService.updateById(cnasTest);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "cnas测试参数列表-通过id删除")
@Operation(summary="cnas测试参数列表-通过id删除")
@RequiresPermissions("database:cnas_test:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
cnasTestService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "cnas测试参数列表-批量删除")
@Operation(summary="cnas测试参数列表-批量删除")
@RequiresPermissions("database:cnas_test:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.cnasTestService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "cnas测试参数列表-通过id查询")
@Operation(summary="cnas测试参数列表-通过id查询")
@GetMapping(value = "/queryById")
public Result<CnasTest> queryById(@RequestParam(name="id",required=true) String id) {
CnasTest cnasTest = cnasTestService.getById(id);
if(cnasTest==null) {
return Result.error("未找到对应数据");
}
return Result.OK(cnasTest);
}
@Autowired
private ICnasTestService cnasTestService;
/**
* 导出excel
*
* @param request
* @param cnasTest
*/
* 分页列表查询
*
* @param cnasTest
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "cnas测试参数列表-分页列表查询")
@Operation(summary = "cnas测试参数列表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<CnasTest>> queryPageList(CnasTest cnasTest,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CnasTest> queryWrapper = QueryGenerator.initQueryWrapper(cnasTest, req.getParameterMap());
Page<CnasTest> page = new Page<CnasTest>(pageNo, pageSize);
IPage<CnasTest> pageList = cnasTestService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param cnasTest
* @return
*/
@AutoLog(value = "cnas测试参数列表-添加")
@Operation(summary = "cnas测试参数列表-添加")
@RequiresPermissions("database:cnas_test:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CnasTest cnasTest) {
cnasTestService.save(cnasTest);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param cnasTest
* @return
*/
@AutoLog(value = "cnas测试参数列表-编辑")
@Operation(summary = "cnas测试参数列表-编辑")
@RequiresPermissions("database:cnas_test:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody CnasTest cnasTest) {
cnasTestService.updateById(cnasTest);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "cnas测试参数列表-通过id删除")
@Operation(summary = "cnas测试参数列表-通过id删除")
@RequiresPermissions("database:cnas_test:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
cnasTestService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "cnas测试参数列表-批量删除")
@Operation(summary = "cnas测试参数列表-批量删除")
@RequiresPermissions("database:cnas_test:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.cnasTestService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "cnas测试参数列表-通过id查询")
@Operation(summary = "cnas测试参数列表-通过id查询")
@GetMapping(value = "/queryById")
public Result<CnasTest> queryById(@RequestParam(name = "id", required = true) String id) {
CnasTest cnasTest = cnasTestService.getById(id);
if (cnasTest == null) {
return Result.error("未找到对应数据");
}
return Result.OK(cnasTest);
}
/**
* 导出excel
*
* @param request
* @param cnasTest
*/
@RequiresPermissions("database:cnas_test:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CnasTest cnasTest) {
@@ -163,12 +147,12 @@ public class CnasTestController extends JeecgController<CnasTest, ICnasTestServi
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:cnas_test:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.Component;
import org.jeecg.modules.database.service.IComponentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.Component;
import org.jeecg.modules.database.service.IComponentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 元器件
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="元器件")
@Tag(name = "元器件")
@RestController
@RequestMapping("/database/component")
@Slf4j
public class ComponentController extends JeecgController<Component, IComponentService> {
@Autowired
private IComponentService componentService;
/**
* 分页列表查询
*
* @param component
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "元器件-分页列表查询")
@Operation(summary="元器件-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Component>> queryPageList(Component component,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Component> queryWrapper = QueryGenerator.initQueryWrapper(component, req.getParameterMap());
Page<Component> page = new Page<Component>(pageNo, pageSize);
IPage<Component> pageList = componentService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param component
* @return
*/
@AutoLog(value = "元器件-添加")
@Operation(summary="元器件-添加")
@RequiresPermissions("database:component:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody Component component) {
componentService.save(component);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param component
* @return
*/
@AutoLog(value = "元器件-编辑")
@Operation(summary="元器件-编辑")
@RequiresPermissions("database:component:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody Component component) {
componentService.updateById(component);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "元器件-通过id删除")
@Operation(summary="元器件-通过id删除")
@RequiresPermissions("database:component:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
componentService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "元器件-批量删除")
@Operation(summary="元器件-批量删除")
@RequiresPermissions("database:component:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.componentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "元器件-通过id查询")
@Operation(summary="元器件-通过id查询")
@GetMapping(value = "/queryById")
public Result<Component> queryById(@RequestParam(name="id",required=true) String id) {
Component component = componentService.getById(id);
if(component==null) {
return Result.error("未找到对应数据");
}
return Result.OK(component);
}
@Autowired
private IComponentService componentService;
/**
* 导出excel
*
* @param request
* @param component
*/
* 分页列表查询
*
* @param component
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "元器件-分页列表查询")
@Operation(summary = "元器件-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Component>> queryPageList(Component component,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Component> queryWrapper = QueryGenerator.initQueryWrapper(component, req.getParameterMap());
Page<Component> page = new Page<Component>(pageNo, pageSize);
IPage<Component> pageList = componentService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param component
* @return
*/
@AutoLog(value = "元器件-添加")
@Operation(summary = "元器件-添加")
@RequiresPermissions("database:component:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody Component component) {
componentService.save(component);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param component
* @return
*/
@AutoLog(value = "元器件-编辑")
@Operation(summary = "元器件-编辑")
@RequiresPermissions("database:component:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody Component component) {
componentService.updateById(component);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "元器件-通过id删除")
@Operation(summary = "元器件-通过id删除")
@RequiresPermissions("database:component:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
componentService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "元器件-批量删除")
@Operation(summary = "元器件-批量删除")
@RequiresPermissions("database:component:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.componentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "元器件-通过id查询")
@Operation(summary = "元器件-通过id查询")
@GetMapping(value = "/queryById")
public Result<Component> queryById(@RequestParam(name = "id", required = true) String id) {
Component component = componentService.getById(id);
if (component == null) {
return Result.error("未找到对应数据");
}
return Result.OK(component);
}
/**
* 导出excel
*
* @param request
* @param component
*/
@RequiresPermissions("database:component:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Component component) {
@@ -163,12 +147,12 @@ public class ComponentController extends JeecgController<Component, IComponentSe
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:component:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.DocumentFavorites;
import org.jeecg.modules.database.service.IDocumentFavoritesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.DocumentFavorites;
import org.jeecg.modules.database.service.IDocumentFavoritesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 我的收藏文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="我的收藏文档")
@Tag(name = "我的收藏文档")
@RestController
@RequestMapping("/database/documentFavorites")
@Slf4j
public class DocumentFavoritesController extends JeecgController<DocumentFavorites, IDocumentFavoritesService> {
@Autowired
private IDocumentFavoritesService documentFavoritesService;
/**
* 分页列表查询
*
* @param documentFavorites
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "我的收藏文档-分页列表查询")
@Operation(summary="我的收藏文档-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<DocumentFavorites>> queryPageList(DocumentFavorites documentFavorites,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<DocumentFavorites> queryWrapper = QueryGenerator.initQueryWrapper(documentFavorites, req.getParameterMap());
Page<DocumentFavorites> page = new Page<DocumentFavorites>(pageNo, pageSize);
IPage<DocumentFavorites> pageList = documentFavoritesService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param documentFavorites
* @return
*/
@AutoLog(value = "我的收藏文档-添加")
@Operation(summary="我的收藏文档-添加")
@RequiresPermissions("database:document_favorites:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody DocumentFavorites documentFavorites) {
documentFavoritesService.save(documentFavorites);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param documentFavorites
* @return
*/
@AutoLog(value = "我的收藏文档-编辑")
@Operation(summary="我的收藏文档-编辑")
@RequiresPermissions("database:document_favorites:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody DocumentFavorites documentFavorites) {
documentFavoritesService.updateById(documentFavorites);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "我的收藏文档-通过id删除")
@Operation(summary="我的收藏文档-通过id删除")
@RequiresPermissions("database:document_favorites:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
documentFavoritesService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "我的收藏文档-批量删除")
@Operation(summary="我的收藏文档-批量删除")
@RequiresPermissions("database:document_favorites:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.documentFavoritesService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "我的收藏文档-通过id查询")
@Operation(summary="我的收藏文档-通过id查询")
@GetMapping(value = "/queryById")
public Result<DocumentFavorites> queryById(@RequestParam(name="id",required=true) String id) {
DocumentFavorites documentFavorites = documentFavoritesService.getById(id);
if(documentFavorites==null) {
return Result.error("未找到对应数据");
}
return Result.OK(documentFavorites);
}
@Autowired
private IDocumentFavoritesService documentFavoritesService;
/**
* 导出excel
*
* @param request
* @param documentFavorites
*/
* 分页列表查询
*
* @param documentFavorites
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "我的收藏文档-分页列表查询")
@Operation(summary = "我的收藏文档-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<DocumentFavorites>> queryPageList(DocumentFavorites documentFavorites,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<DocumentFavorites> queryWrapper = QueryGenerator.initQueryWrapper(documentFavorites, req.getParameterMap());
Page<DocumentFavorites> page = new Page<DocumentFavorites>(pageNo, pageSize);
IPage<DocumentFavorites> pageList = documentFavoritesService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param documentFavorites
* @return
*/
@AutoLog(value = "我的收藏文档-添加")
@Operation(summary = "我的收藏文档-添加")
@RequiresPermissions("database:document_favorites:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody DocumentFavorites documentFavorites) {
documentFavoritesService.save(documentFavorites);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param documentFavorites
* @return
*/
@AutoLog(value = "我的收藏文档-编辑")
@Operation(summary = "我的收藏文档-编辑")
@RequiresPermissions("database:document_favorites:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody DocumentFavorites documentFavorites) {
documentFavoritesService.updateById(documentFavorites);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "我的收藏文档-通过id删除")
@Operation(summary = "我的收藏文档-通过id删除")
@RequiresPermissions("database:document_favorites:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
documentFavoritesService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "我的收藏文档-批量删除")
@Operation(summary = "我的收藏文档-批量删除")
@RequiresPermissions("database:document_favorites:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.documentFavoritesService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "我的收藏文档-通过id查询")
@Operation(summary = "我的收藏文档-通过id查询")
@GetMapping(value = "/queryById")
public Result<DocumentFavorites> queryById(@RequestParam(name = "id", required = true) String id) {
DocumentFavorites documentFavorites = documentFavoritesService.getById(id);
if (documentFavorites == null) {
return Result.error("未找到对应数据");
}
return Result.OK(documentFavorites);
}
/**
* 导出excel
*
* @param request
* @param documentFavorites
*/
@RequiresPermissions("database:document_favorites:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DocumentFavorites documentFavorites) {
@@ -163,12 +147,12 @@ public class DocumentFavoritesController extends JeecgController<DocumentFavorit
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:document_favorites:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.Equipment;
import org.jeecg.modules.database.service.IEquipmentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.Equipment;
import org.jeecg.modules.database.service.IEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 设备
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="设备")
@Tag(name = "设备")
@RestController
@RequestMapping("/database/equipment")
@Slf4j
public class EquipmentController extends JeecgController<Equipment, IEquipmentService> {
@Autowired
private IEquipmentService equipmentService;
/**
* 分页列表查询
*
* @param equipment
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "设备-分页列表查询")
@Operation(summary="设备-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Equipment>> queryPageList(Equipment equipment,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param equipment
* @return
*/
@AutoLog(value = "设备-添加")
@Operation(summary="设备-添加")
@RequiresPermissions("database:equipment:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody Equipment equipment) {
equipmentService.save(equipment);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param equipment
* @return
*/
@AutoLog(value = "设备-编辑")
@Operation(summary="设备-编辑")
@RequiresPermissions("database:equipment:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody Equipment equipment) {
equipmentService.updateById(equipment);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "设备-通过id删除")
@Operation(summary="设备-通过id删除")
@RequiresPermissions("database:equipment:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
equipmentService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "设备-批量删除")
@Operation(summary="设备-批量删除")
@RequiresPermissions("database:equipment:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.equipmentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "设备-通过id查询")
@Operation(summary="设备-通过id查询")
@GetMapping(value = "/queryById")
public Result<Equipment> queryById(@RequestParam(name="id",required=true) String id) {
Equipment equipment = equipmentService.getById(id);
if(equipment==null) {
return Result.error("未找到对应数据");
}
return Result.OK(equipment);
}
@Autowired
private IEquipmentService equipmentService;
/**
* 导出excel
*
* @param request
* @param equipment
*/
* 分页列表查询
*
* @param equipment
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "设备-分页列表查询")
@Operation(summary = "设备-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Equipment>> queryPageList(Equipment equipment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param equipment
* @return
*/
@AutoLog(value = "设备-添加")
@Operation(summary = "设备-添加")
@RequiresPermissions("database:equipment:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody Equipment equipment) {
equipmentService.save(equipment);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param equipment
* @return
*/
@AutoLog(value = "设备-编辑")
@Operation(summary = "设备-编辑")
@RequiresPermissions("database:equipment:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody Equipment equipment) {
equipmentService.updateById(equipment);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "设备-通过id删除")
@Operation(summary = "设备-通过id删除")
@RequiresPermissions("database:equipment:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
equipmentService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "设备-批量删除")
@Operation(summary = "设备-批量删除")
@RequiresPermissions("database:equipment:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.equipmentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "设备-通过id查询")
@Operation(summary = "设备-通过id查询")
@GetMapping(value = "/queryById")
public Result<Equipment> queryById(@RequestParam(name = "id", required = true) String id) {
Equipment equipment = equipmentService.getById(id);
if (equipment == null) {
return Result.error("未找到对应数据");
}
return Result.OK(equipment);
}
/**
* 导出excel
*
* @param request
* @param equipment
*/
@RequiresPermissions("database:equipment:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Equipment equipment) {
@@ -163,12 +147,12 @@ public class EquipmentController extends JeecgController<Equipment, IEquipmentSe
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:equipment:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.util.JwtUtil;

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.ExperimentDoc;
import org.jeecg.modules.database.service.IExperimentDocService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.ExperimentDoc;
import org.jeecg.modules.database.service.IExperimentDocService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 试验文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="试验文档")
@Tag(name = "试验文档")
@RestController
@RequestMapping("/database/experimentDoc")
@Slf4j
public class ExperimentDocController extends JeecgController<ExperimentDoc, IExperimentDocService> {
@Autowired
private IExperimentDocService experimentDocService;
/**
* 分页列表查询
*
* @param experimentDoc
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "试验文档-分页列表查询")
@Operation(summary="试验文档-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ExperimentDoc>> queryPageList(ExperimentDoc experimentDoc,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ExperimentDoc> queryWrapper = QueryGenerator.initQueryWrapper(experimentDoc, req.getParameterMap());
Page<ExperimentDoc> page = new Page<ExperimentDoc>(pageNo, pageSize);
IPage<ExperimentDoc> pageList = experimentDocService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param experimentDoc
* @return
*/
@AutoLog(value = "试验文档-添加")
@Operation(summary="试验文档-添加")
@RequiresPermissions("database:experiment_doc:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentDoc experimentDoc) {
experimentDocService.save(experimentDoc);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param experimentDoc
* @return
*/
@AutoLog(value = "试验文档-编辑")
@Operation(summary="试验文档-编辑")
@RequiresPermissions("database:experiment_doc:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentDoc experimentDoc) {
experimentDocService.updateById(experimentDoc);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "试验文档-通过id删除")
@Operation(summary="试验文档-通过id删除")
@RequiresPermissions("database:experiment_doc:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
experimentDocService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "试验文档-批量删除")
@Operation(summary="试验文档-批量删除")
@RequiresPermissions("database:experiment_doc:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.experimentDocService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "试验文档-通过id查询")
@Operation(summary="试验文档-通过id查询")
@GetMapping(value = "/queryById")
public Result<ExperimentDoc> queryById(@RequestParam(name="id",required=true) String id) {
ExperimentDoc experimentDoc = experimentDocService.getById(id);
if(experimentDoc==null) {
return Result.error("未找到对应数据");
}
return Result.OK(experimentDoc);
}
@Autowired
private IExperimentDocService experimentDocService;
/**
* 导出excel
*
* @param request
* @param experimentDoc
*/
* 分页列表查询
*
* @param experimentDoc
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "试验文档-分页列表查询")
@Operation(summary = "试验文档-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ExperimentDoc>> queryPageList(ExperimentDoc experimentDoc,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ExperimentDoc> queryWrapper = QueryGenerator.initQueryWrapper(experimentDoc, req.getParameterMap());
Page<ExperimentDoc> page = new Page<ExperimentDoc>(pageNo, pageSize);
IPage<ExperimentDoc> pageList = experimentDocService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param experimentDoc
* @return
*/
@AutoLog(value = "试验文档-添加")
@Operation(summary = "试验文档-添加")
@RequiresPermissions("database:experiment_doc:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentDoc experimentDoc) {
experimentDocService.save(experimentDoc);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param experimentDoc
* @return
*/
@AutoLog(value = "试验文档-编辑")
@Operation(summary = "试验文档-编辑")
@RequiresPermissions("database:experiment_doc:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentDoc experimentDoc) {
experimentDocService.updateById(experimentDoc);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "试验文档-通过id删除")
@Operation(summary = "试验文档-通过id删除")
@RequiresPermissions("database:experiment_doc:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
experimentDocService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "试验文档-批量删除")
@Operation(summary = "试验文档-批量删除")
@RequiresPermissions("database:experiment_doc:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.experimentDocService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "试验文档-通过id查询")
@Operation(summary = "试验文档-通过id查询")
@GetMapping(value = "/queryById")
public Result<ExperimentDoc> queryById(@RequestParam(name = "id", required = true) String id) {
ExperimentDoc experimentDoc = experimentDocService.getById(id);
if (experimentDoc == null) {
return Result.error("未找到对应数据");
}
return Result.OK(experimentDoc);
}
/**
* 导出excel
*
* @param request
* @param experimentDoc
*/
@RequiresPermissions("database:experiment_doc:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentDoc experimentDoc) {
@@ -163,12 +147,12 @@ public class ExperimentDocController extends JeecgController<ExperimentDoc, IExp
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:experiment_doc:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.ExperimentLog;
import org.jeecg.modules.database.service.IExperimentLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.ExperimentLog;
import org.jeecg.modules.database.service.IExperimentLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 试验日志
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="试验日志")
@Tag(name = "试验日志")
@RestController
@RequestMapping("/database/experimentLog")
@Slf4j
public class ExperimentLogController extends JeecgController<ExperimentLog, IExperimentLogService> {
@Autowired
private IExperimentLogService experimentLogService;
/**
* 分页列表查询
*
* @param experimentLog
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "试验日志-分页列表查询")
@Operation(summary="试验日志-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ExperimentLog>> queryPageList(ExperimentLog experimentLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ExperimentLog> queryWrapper = QueryGenerator.initQueryWrapper(experimentLog, req.getParameterMap());
Page<ExperimentLog> page = new Page<ExperimentLog>(pageNo, pageSize);
IPage<ExperimentLog> pageList = experimentLogService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param experimentLog
* @return
*/
@AutoLog(value = "试验日志-添加")
@Operation(summary="试验日志-添加")
@RequiresPermissions("database:experiment_log:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentLog experimentLog) {
experimentLogService.save(experimentLog);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param experimentLog
* @return
*/
@AutoLog(value = "试验日志-编辑")
@Operation(summary="试验日志-编辑")
@RequiresPermissions("database:experiment_log:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentLog experimentLog) {
experimentLogService.updateById(experimentLog);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "试验日志-通过id删除")
@Operation(summary="试验日志-通过id删除")
@RequiresPermissions("database:experiment_log:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
experimentLogService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "试验日志-批量删除")
@Operation(summary="试验日志-批量删除")
@RequiresPermissions("database:experiment_log:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.experimentLogService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "试验日志-通过id查询")
@Operation(summary="试验日志-通过id查询")
@GetMapping(value = "/queryById")
public Result<ExperimentLog> queryById(@RequestParam(name="id",required=true) String id) {
ExperimentLog experimentLog = experimentLogService.getById(id);
if(experimentLog==null) {
return Result.error("未找到对应数据");
}
return Result.OK(experimentLog);
}
@Autowired
private IExperimentLogService experimentLogService;
/**
* 导出excel
*
* @param request
* @param experimentLog
*/
* 分页列表查询
*
* @param experimentLog
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "试验日志-分页列表查询")
@Operation(summary = "试验日志-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ExperimentLog>> queryPageList(ExperimentLog experimentLog,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ExperimentLog> queryWrapper = QueryGenerator.initQueryWrapper(experimentLog, req.getParameterMap());
Page<ExperimentLog> page = new Page<ExperimentLog>(pageNo, pageSize);
IPage<ExperimentLog> pageList = experimentLogService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param experimentLog
* @return
*/
@AutoLog(value = "试验日志-添加")
@Operation(summary = "试验日志-添加")
@RequiresPermissions("database:experiment_log:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentLog experimentLog) {
experimentLogService.save(experimentLog);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param experimentLog
* @return
*/
@AutoLog(value = "试验日志-编辑")
@Operation(summary = "试验日志-编辑")
@RequiresPermissions("database:experiment_log:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentLog experimentLog) {
experimentLogService.updateById(experimentLog);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "试验日志-通过id删除")
@Operation(summary = "试验日志-通过id删除")
@RequiresPermissions("database:experiment_log:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
experimentLogService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "试验日志-批量删除")
@Operation(summary = "试验日志-批量删除")
@RequiresPermissions("database:experiment_log:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.experimentLogService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "试验日志-通过id查询")
@Operation(summary = "试验日志-通过id查询")
@GetMapping(value = "/queryById")
public Result<ExperimentLog> queryById(@RequestParam(name = "id", required = true) String id) {
ExperimentLog experimentLog = experimentLogService.getById(id);
if (experimentLog == null) {
return Result.error("未找到对应数据");
}
return Result.OK(experimentLog);
}
/**
* 导出excel
*
* @param request
* @param experimentLog
*/
@RequiresPermissions("database:experiment_log:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentLog experimentLog) {
@@ -163,12 +147,12 @@ public class ExperimentLogController extends JeecgController<ExperimentLog, IExp
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:experiment_log:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -0,0 +1,162 @@
package org.jeecg.modules.database.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.ExperimentReview;
import org.jeecg.modules.database.service.IExperimentReviewService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
/**
* @Description: 试验评定
* @Author: jeecg-boot
* @Date: 2024-11-05
* @Version: V1.0
*/
@Tag(name = "试验评定")
@RestController
@RequestMapping("/database/experimentReview")
@Slf4j
public class ExperimentReviewController extends JeecgController<ExperimentReview, IExperimentReviewService> {
@Autowired
private IExperimentReviewService experimentReviewService;
/**
* 分页列表查询
*
* @param experimentReview
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "试验评定-分页列表查询")
@Operation(summary = "试验评定-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ExperimentReview>> queryPageList(ExperimentReview experimentReview,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ExperimentReview> queryWrapper = QueryGenerator.initQueryWrapper(experimentReview, req.getParameterMap());
Page<ExperimentReview> page = new Page<ExperimentReview>(pageNo, pageSize);
IPage<ExperimentReview> pageList = experimentReviewService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param experimentReview
* @return
*/
@AutoLog(value = "试验评定-添加")
@Operation(summary = "试验评定-添加")
@RequiresPermissions("database:experiment_review:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentReview experimentReview) {
experimentReviewService.save(experimentReview);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param experimentReview
* @return
*/
@AutoLog(value = "试验评定-编辑")
@Operation(summary = "试验评定-编辑")
@RequiresPermissions("database:experiment_review:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentReview experimentReview) {
experimentReviewService.updateById(experimentReview);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "试验评定-通过id删除")
@Operation(summary = "试验评定-通过id删除")
@RequiresPermissions("database:experiment_review:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
experimentReviewService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "试验评定-批量删除")
@Operation(summary = "试验评定-批量删除")
@RequiresPermissions("database:experiment_review:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.experimentReviewService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "试验评定-通过id查询")
@Operation(summary = "试验评定-通过id查询")
@GetMapping(value = "/queryById")
public Result<ExperimentReview> queryById(@RequestParam(name = "id", required = true) String id) {
ExperimentReview experimentReview = experimentReviewService.getById(id);
if (experimentReview == null) {
return Result.error("未找到对应数据");
}
return Result.OK(experimentReview);
}
/**
* 导出excel
*
* @param request
* @param experimentReview
*/
@RequiresPermissions("database:experiment_review:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentReview experimentReview) {
return super.exportXls(request, experimentReview, ExperimentReview.class, "试验评定");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:experiment_review:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentReview.class);
}
}

View File

@@ -51,6 +51,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
@Autowired
private IExperimentService experimentService;
/**
* 分页列表查询
*

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.IrradiationStandards;
import org.jeecg.modules.database.service.IIrradiationStandardsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.IrradiationStandards;
import org.jeecg.modules.database.service.IIrradiationStandardsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 辐照标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="辐照标准")
@Tag(name = "辐照标准")
@RestController
@RequestMapping("/database/irradiationStandards")
@Slf4j
public class IrradiationStandardsController extends JeecgController<IrradiationStandards, IIrradiationStandardsService> {
@Autowired
private IIrradiationStandardsService irradiationStandardsService;
/**
* 分页列表查询
*
* @param irradiationStandards
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "辐照标准-分页列表查询")
@Operation(summary="辐照标准-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<IrradiationStandards>> queryPageList(IrradiationStandards irradiationStandards,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<IrradiationStandards> queryWrapper = QueryGenerator.initQueryWrapper(irradiationStandards, req.getParameterMap());
Page<IrradiationStandards> page = new Page<IrradiationStandards>(pageNo, pageSize);
IPage<IrradiationStandards> pageList = irradiationStandardsService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param irradiationStandards
* @return
*/
@AutoLog(value = "辐照标准-添加")
@Operation(summary="辐照标准-添加")
@RequiresPermissions("database:irradiation_standards:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody IrradiationStandards irradiationStandards) {
irradiationStandardsService.save(irradiationStandards);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param irradiationStandards
* @return
*/
@AutoLog(value = "辐照标准-编辑")
@Operation(summary="辐照标准-编辑")
@RequiresPermissions("database:irradiation_standards:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody IrradiationStandards irradiationStandards) {
irradiationStandardsService.updateById(irradiationStandards);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "辐照标准-通过id删除")
@Operation(summary="辐照标准-通过id删除")
@RequiresPermissions("database:irradiation_standards:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
irradiationStandardsService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "辐照标准-批量删除")
@Operation(summary="辐照标准-批量删除")
@RequiresPermissions("database:irradiation_standards:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.irradiationStandardsService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "辐照标准-通过id查询")
@Operation(summary="辐照标准-通过id查询")
@GetMapping(value = "/queryById")
public Result<IrradiationStandards> queryById(@RequestParam(name="id",required=true) String id) {
IrradiationStandards irradiationStandards = irradiationStandardsService.getById(id);
if(irradiationStandards==null) {
return Result.error("未找到对应数据");
}
return Result.OK(irradiationStandards);
}
@Autowired
private IIrradiationStandardsService irradiationStandardsService;
/**
* 导出excel
*
* @param request
* @param irradiationStandards
*/
* 分页列表查询
*
* @param irradiationStandards
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "辐照标准-分页列表查询")
@Operation(summary = "辐照标准-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<IrradiationStandards>> queryPageList(IrradiationStandards irradiationStandards,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<IrradiationStandards> queryWrapper = QueryGenerator.initQueryWrapper(irradiationStandards, req.getParameterMap());
Page<IrradiationStandards> page = new Page<IrradiationStandards>(pageNo, pageSize);
IPage<IrradiationStandards> pageList = irradiationStandardsService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param irradiationStandards
* @return
*/
@AutoLog(value = "辐照标准-添加")
@Operation(summary = "辐照标准-添加")
@RequiresPermissions("database:irradiation_standards:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody IrradiationStandards irradiationStandards) {
irradiationStandardsService.save(irradiationStandards);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param irradiationStandards
* @return
*/
@AutoLog(value = "辐照标准-编辑")
@Operation(summary = "辐照标准-编辑")
@RequiresPermissions("database:irradiation_standards:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody IrradiationStandards irradiationStandards) {
irradiationStandardsService.updateById(irradiationStandards);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "辐照标准-通过id删除")
@Operation(summary = "辐照标准-通过id删除")
@RequiresPermissions("database:irradiation_standards:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
irradiationStandardsService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "辐照标准-批量删除")
@Operation(summary = "辐照标准-批量删除")
@RequiresPermissions("database:irradiation_standards:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.irradiationStandardsService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "辐照标准-通过id查询")
@Operation(summary = "辐照标准-通过id查询")
@GetMapping(value = "/queryById")
public Result<IrradiationStandards> queryById(@RequestParam(name = "id", required = true) String id) {
IrradiationStandards irradiationStandards = irradiationStandardsService.getById(id);
if (irradiationStandards == null) {
return Result.error("未找到对应数据");
}
return Result.OK(irradiationStandards);
}
/**
* 导出excel
*
* @param request
* @param irradiationStandards
*/
@RequiresPermissions("database:irradiation_standards:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, IrradiationStandards irradiationStandards) {
@@ -163,12 +147,12 @@ public class IrradiationStandardsController extends JeecgController<IrradiationS
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:irradiation_standards:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.MigrationDataRecord;
import org.jeecg.modules.database.service.IMigrationDataRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.MigrationDataRecord;
import org.jeecg.modules.database.service.IMigrationDataRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 迁移数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
@Tag(name="迁移数据管理")
@Tag(name = "迁移数据管理")
@RestController
@RequestMapping("/database/migrationDataRecord")
@Slf4j
public class MigrationDataRecordController extends JeecgController<MigrationDataRecord, IMigrationDataRecordService> {
@Autowired
private IMigrationDataRecordService migrationDataRecordService;
/**
* 分页列表查询
*
* @param migrationDataRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "迁移数据管理-分页列表查询")
@Operation(summary="迁移数据管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MigrationDataRecord>> queryPageList(MigrationDataRecord migrationDataRecord,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MigrationDataRecord> queryWrapper = QueryGenerator.initQueryWrapper(migrationDataRecord, req.getParameterMap());
Page<MigrationDataRecord> page = new Page<MigrationDataRecord>(pageNo, pageSize);
IPage<MigrationDataRecord> pageList = migrationDataRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param migrationDataRecord
* @return
*/
@AutoLog(value = "迁移数据管理-添加")
@Operation(summary="迁移数据管理-添加")
@RequiresPermissions("database:migration_data_record:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MigrationDataRecord migrationDataRecord) {
migrationDataRecordService.save(migrationDataRecord);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param migrationDataRecord
* @return
*/
@AutoLog(value = "迁移数据管理-编辑")
@Operation(summary="迁移数据管理-编辑")
@RequiresPermissions("database:migration_data_record:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody MigrationDataRecord migrationDataRecord) {
migrationDataRecordService.updateById(migrationDataRecord);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "迁移数据管理-通过id删除")
@Operation(summary="迁移数据管理-通过id删除")
@RequiresPermissions("database:migration_data_record:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
migrationDataRecordService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "迁移数据管理-批量删除")
@Operation(summary="迁移数据管理-批量删除")
@RequiresPermissions("database:migration_data_record:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.migrationDataRecordService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "迁移数据管理-通过id查询")
@Operation(summary="迁移数据管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<MigrationDataRecord> queryById(@RequestParam(name="id",required=true) String id) {
MigrationDataRecord migrationDataRecord = migrationDataRecordService.getById(id);
if(migrationDataRecord==null) {
return Result.error("未找到对应数据");
}
return Result.OK(migrationDataRecord);
}
@Autowired
private IMigrationDataRecordService migrationDataRecordService;
/**
* 导出excel
*
* @param request
* @param migrationDataRecord
*/
* 分页列表查询
*
* @param migrationDataRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "迁移数据管理-分页列表查询")
@Operation(summary = "迁移数据管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MigrationDataRecord>> queryPageList(MigrationDataRecord migrationDataRecord,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MigrationDataRecord> queryWrapper = QueryGenerator.initQueryWrapper(migrationDataRecord, req.getParameterMap());
Page<MigrationDataRecord> page = new Page<MigrationDataRecord>(pageNo, pageSize);
IPage<MigrationDataRecord> pageList = migrationDataRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param migrationDataRecord
* @return
*/
@AutoLog(value = "迁移数据管理-添加")
@Operation(summary = "迁移数据管理-添加")
@RequiresPermissions("database:migration_data_record:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MigrationDataRecord migrationDataRecord) {
migrationDataRecordService.save(migrationDataRecord);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param migrationDataRecord
* @return
*/
@AutoLog(value = "迁移数据管理-编辑")
@Operation(summary = "迁移数据管理-编辑")
@RequiresPermissions("database:migration_data_record:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MigrationDataRecord migrationDataRecord) {
migrationDataRecordService.updateById(migrationDataRecord);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "迁移数据管理-通过id删除")
@Operation(summary = "迁移数据管理-通过id删除")
@RequiresPermissions("database:migration_data_record:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
migrationDataRecordService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "迁移数据管理-批量删除")
@Operation(summary = "迁移数据管理-批量删除")
@RequiresPermissions("database:migration_data_record:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.migrationDataRecordService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "迁移数据管理-通过id查询")
@Operation(summary = "迁移数据管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<MigrationDataRecord> queryById(@RequestParam(name = "id", required = true) String id) {
MigrationDataRecord migrationDataRecord = migrationDataRecordService.getById(id);
if (migrationDataRecord == null) {
return Result.error("未找到对应数据");
}
return Result.OK(migrationDataRecord);
}
/**
* 导出excel
*
* @param request
* @param migrationDataRecord
*/
@RequiresPermissions("database:migration_data_record:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MigrationDataRecord migrationDataRecord) {
@@ -163,12 +147,12 @@ public class MigrationDataRecordController extends JeecgController<MigrationData
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:migration_data_record:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.NasaDataRecord;
import org.jeecg.modules.database.service.INasaDataRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.NasaDataRecord;
import org.jeecg.modules.database.service.INasaDataRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: NASA数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
@Tag(name="NASA数据管理")
@Tag(name = "NASA数据管理")
@RestController
@RequestMapping("/database/nasaDataRecord")
@Slf4j
public class NasaDataRecordController extends JeecgController<NasaDataRecord, INasaDataRecordService> {
@Autowired
private INasaDataRecordService nasaDataRecordService;
/**
* 分页列表查询
*
* @param nasaDataRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "NASA数据管理-分页列表查询")
@Operation(summary="NASA数据管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<NasaDataRecord>> queryPageList(NasaDataRecord nasaDataRecord,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NasaDataRecord> queryWrapper = QueryGenerator.initQueryWrapper(nasaDataRecord, req.getParameterMap());
Page<NasaDataRecord> page = new Page<NasaDataRecord>(pageNo, pageSize);
IPage<NasaDataRecord> pageList = nasaDataRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param nasaDataRecord
* @return
*/
@AutoLog(value = "NASA数据管理-添加")
@Operation(summary="NASA数据管理-添加")
@RequiresPermissions("database:nasa_data_record:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody NasaDataRecord nasaDataRecord) {
nasaDataRecordService.save(nasaDataRecord);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param nasaDataRecord
* @return
*/
@AutoLog(value = "NASA数据管理-编辑")
@Operation(summary="NASA数据管理-编辑")
@RequiresPermissions("database:nasa_data_record:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NasaDataRecord nasaDataRecord) {
nasaDataRecordService.updateById(nasaDataRecord);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "NASA数据管理-通过id删除")
@Operation(summary="NASA数据管理-通过id删除")
@RequiresPermissions("database:nasa_data_record:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
nasaDataRecordService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "NASA数据管理-批量删除")
@Operation(summary="NASA数据管理-批量删除")
@RequiresPermissions("database:nasa_data_record:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.nasaDataRecordService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "NASA数据管理-通过id查询")
@Operation(summary="NASA数据管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<NasaDataRecord> queryById(@RequestParam(name="id",required=true) String id) {
NasaDataRecord nasaDataRecord = nasaDataRecordService.getById(id);
if(nasaDataRecord==null) {
return Result.error("未找到对应数据");
}
return Result.OK(nasaDataRecord);
}
@Autowired
private INasaDataRecordService nasaDataRecordService;
/**
* 导出excel
*
* @param request
* @param nasaDataRecord
*/
* 分页列表查询
*
* @param nasaDataRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "NASA数据管理-分页列表查询")
@Operation(summary = "NASA数据管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<NasaDataRecord>> queryPageList(NasaDataRecord nasaDataRecord,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NasaDataRecord> queryWrapper = QueryGenerator.initQueryWrapper(nasaDataRecord, req.getParameterMap());
Page<NasaDataRecord> page = new Page<NasaDataRecord>(pageNo, pageSize);
IPage<NasaDataRecord> pageList = nasaDataRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param nasaDataRecord
* @return
*/
@AutoLog(value = "NASA数据管理-添加")
@Operation(summary = "NASA数据管理-添加")
@RequiresPermissions("database:nasa_data_record:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody NasaDataRecord nasaDataRecord) {
nasaDataRecordService.save(nasaDataRecord);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param nasaDataRecord
* @return
*/
@AutoLog(value = "NASA数据管理-编辑")
@Operation(summary = "NASA数据管理-编辑")
@RequiresPermissions("database:nasa_data_record:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody NasaDataRecord nasaDataRecord) {
nasaDataRecordService.updateById(nasaDataRecord);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "NASA数据管理-通过id删除")
@Operation(summary = "NASA数据管理-通过id删除")
@RequiresPermissions("database:nasa_data_record:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
nasaDataRecordService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "NASA数据管理-批量删除")
@Operation(summary = "NASA数据管理-批量删除")
@RequiresPermissions("database:nasa_data_record:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.nasaDataRecordService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "NASA数据管理-通过id查询")
@Operation(summary = "NASA数据管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<NasaDataRecord> queryById(@RequestParam(name = "id", required = true) String id) {
NasaDataRecord nasaDataRecord = nasaDataRecordService.getById(id);
if (nasaDataRecord == null) {
return Result.error("未找到对应数据");
}
return Result.OK(nasaDataRecord);
}
/**
* 导出excel
*
* @param request
* @param nasaDataRecord
*/
@RequiresPermissions("database:nasa_data_record:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NasaDataRecord nasaDataRecord) {
@@ -163,12 +147,12 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:nasa_data_record:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.RadiateType;
import org.jeecg.modules.database.service.IRadiateTypeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.RadiateType;
import org.jeecg.modules.database.service.IRadiateTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 辐射源类型
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="辐射源类型")
@Tag(name = "辐射源类型")
@RestController
@RequestMapping("/database/radiateType")
@Slf4j
public class RadiateTypeController extends JeecgController<RadiateType, IRadiateTypeService> {
@Autowired
private IRadiateTypeService radiateTypeService;
/**
* 分页列表查询
*
* @param radiateType
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "辐射源类型-分页列表查询")
@Operation(summary="辐射源类型-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<RadiateType>> queryPageList(RadiateType radiateType,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<RadiateType> queryWrapper = QueryGenerator.initQueryWrapper(radiateType, req.getParameterMap());
Page<RadiateType> page = new Page<RadiateType>(pageNo, pageSize);
IPage<RadiateType> pageList = radiateTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param radiateType
* @return
*/
@AutoLog(value = "辐射源类型-添加")
@Operation(summary="辐射源类型-添加")
@RequiresPermissions("database:radiate_type:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody RadiateType radiateType) {
radiateTypeService.save(radiateType);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param radiateType
* @return
*/
@AutoLog(value = "辐射源类型-编辑")
@Operation(summary="辐射源类型-编辑")
@RequiresPermissions("database:radiate_type:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody RadiateType radiateType) {
radiateTypeService.updateById(radiateType);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "辐射源类型-通过id删除")
@Operation(summary="辐射源类型-通过id删除")
@RequiresPermissions("database:radiate_type:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
radiateTypeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "辐射源类型-批量删除")
@Operation(summary="辐射源类型-批量删除")
@RequiresPermissions("database:radiate_type:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.radiateTypeService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "辐射源类型-通过id查询")
@Operation(summary="辐射源类型-通过id查询")
@GetMapping(value = "/queryById")
public Result<RadiateType> queryById(@RequestParam(name="id",required=true) String id) {
RadiateType radiateType = radiateTypeService.getById(id);
if(radiateType==null) {
return Result.error("未找到对应数据");
}
return Result.OK(radiateType);
}
@Autowired
private IRadiateTypeService radiateTypeService;
/**
* 导出excel
*
* @param request
* @param radiateType
*/
* 分页列表查询
*
* @param radiateType
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "辐射源类型-分页列表查询")
@Operation(summary = "辐射源类型-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<RadiateType>> queryPageList(RadiateType radiateType,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<RadiateType> queryWrapper = QueryGenerator.initQueryWrapper(radiateType, req.getParameterMap());
Page<RadiateType> page = new Page<RadiateType>(pageNo, pageSize);
IPage<RadiateType> pageList = radiateTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param radiateType
* @return
*/
@AutoLog(value = "辐射源类型-添加")
@Operation(summary = "辐射源类型-添加")
@RequiresPermissions("database:radiate_type:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody RadiateType radiateType) {
radiateTypeService.save(radiateType);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param radiateType
* @return
*/
@AutoLog(value = "辐射源类型-编辑")
@Operation(summary = "辐射源类型-编辑")
@RequiresPermissions("database:radiate_type:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody RadiateType radiateType) {
radiateTypeService.updateById(radiateType);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "辐射源类型-通过id删除")
@Operation(summary = "辐射源类型-通过id删除")
@RequiresPermissions("database:radiate_type:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
radiateTypeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "辐射源类型-批量删除")
@Operation(summary = "辐射源类型-批量删除")
@RequiresPermissions("database:radiate_type:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.radiateTypeService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "辐射源类型-通过id查询")
@Operation(summary = "辐射源类型-通过id查询")
@GetMapping(value = "/queryById")
public Result<RadiateType> queryById(@RequestParam(name = "id", required = true) String id) {
RadiateType radiateType = radiateTypeService.getById(id);
if (radiateType == null) {
return Result.error("未找到对应数据");
}
return Result.OK(radiateType);
}
/**
* 导出excel
*
* @param request
* @param radiateType
*/
@RequiresPermissions("database:radiate_type:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, RadiateType radiateType) {
@@ -163,12 +147,12 @@ public class RadiateTypeController extends JeecgController<RadiateType, IRadiate
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:radiate_type:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,161 +1,145 @@
package org.jeecg.modules.database.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.TestStandards;
import org.jeecg.modules.database.service.ITestStandardsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.TestStandards;
import org.jeecg.modules.database.service.ITestStandardsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
import java.util.Arrays;
/**
* @Description: 测试标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Tag(name="测试标准")
@Tag(name = "测试标准")
@RestController
@RequestMapping("/database/testStandards")
@Slf4j
public class TestStandardsController extends JeecgController<TestStandards, ITestStandardsService> {
@Autowired
private ITestStandardsService testStandardsService;
/**
* 分页列表查询
*
* @param testStandards
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "测试标准-分页列表查询")
@Operation(summary="测试标准-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<TestStandards>> queryPageList(TestStandards testStandards,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TestStandards> queryWrapper = QueryGenerator.initQueryWrapper(testStandards, req.getParameterMap());
Page<TestStandards> page = new Page<TestStandards>(pageNo, pageSize);
IPage<TestStandards> pageList = testStandardsService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param testStandards
* @return
*/
@AutoLog(value = "测试标准-添加")
@Operation(summary="测试标准-添加")
@RequiresPermissions("database:test_standards:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TestStandards testStandards) {
testStandardsService.save(testStandards);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param testStandards
* @return
*/
@AutoLog(value = "测试标准-编辑")
@Operation(summary="测试标准-编辑")
@RequiresPermissions("database:test_standards:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody TestStandards testStandards) {
testStandardsService.updateById(testStandards);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "测试标准-通过id删除")
@Operation(summary="测试标准-通过id删除")
@RequiresPermissions("database:test_standards:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
testStandardsService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "测试标准-批量删除")
@Operation(summary="测试标准-批量删除")
@RequiresPermissions("database:test_standards:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.testStandardsService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "测试标准-通过id查询")
@Operation(summary="测试标准-通过id查询")
@GetMapping(value = "/queryById")
public Result<TestStandards> queryById(@RequestParam(name="id",required=true) String id) {
TestStandards testStandards = testStandardsService.getById(id);
if(testStandards==null) {
return Result.error("未找到对应数据");
}
return Result.OK(testStandards);
}
@Autowired
private ITestStandardsService testStandardsService;
/**
* 导出excel
*
* @param request
* @param testStandards
*/
* 分页列表查询
*
* @param testStandards
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "测试标准-分页列表查询")
@Operation(summary = "测试标准-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<TestStandards>> queryPageList(TestStandards testStandards,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TestStandards> queryWrapper = QueryGenerator.initQueryWrapper(testStandards, req.getParameterMap());
Page<TestStandards> page = new Page<TestStandards>(pageNo, pageSize);
IPage<TestStandards> pageList = testStandardsService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param testStandards
* @return
*/
@AutoLog(value = "测试标准-添加")
@Operation(summary = "测试标准-添加")
@RequiresPermissions("database:test_standards:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TestStandards testStandards) {
testStandardsService.save(testStandards);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param testStandards
* @return
*/
@AutoLog(value = "测试标准-编辑")
@Operation(summary = "测试标准-编辑")
@RequiresPermissions("database:test_standards:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody TestStandards testStandards) {
testStandardsService.updateById(testStandards);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "测试标准-通过id删除")
@Operation(summary = "测试标准-通过id删除")
@RequiresPermissions("database:test_standards:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
testStandardsService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "测试标准-批量删除")
@Operation(summary = "测试标准-批量删除")
@RequiresPermissions("database:test_standards:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.testStandardsService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "测试标准-通过id查询")
@Operation(summary = "测试标准-通过id查询")
@GetMapping(value = "/queryById")
public Result<TestStandards> queryById(@RequestParam(name = "id", required = true) String id) {
TestStandards testStandards = testStandardsService.getById(id);
if (testStandards == null) {
return Result.error("未找到对应数据");
}
return Result.OK(testStandards);
}
/**
* 导出excel
*
* @param request
* @param testStandards
*/
@RequiresPermissions("database:test_standards:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TestStandards testStandards) {
@@ -163,12 +147,12 @@ public class TestStandardsController extends JeecgController<TestStandards, ITes
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("database:test_standards:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

View File

@@ -1,65 +1,78 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 委托方
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("client")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="委托方")
@Schema(description = "委托方")
public class Client implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**名称*/
@Excel(name = "名称", width = 15)
/**
* 名称
*/
@Excel(name = "名称", width = 15)
@Schema(description = "名称")
private String name;
/**地址*/
@Excel(name = "地址", width = 15)
/**
* 地址
*/
@Excel(name = "地址", width = 15)
@Schema(description = "地址")
private String address;
}

View File

@@ -1,75 +1,92 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: cnas测试参数列表
* @Author: jeecg-boot
* @Date: 2024-10-23
* @Date: 2024-10-23
* @Version: V1.0
*/
@Data
@TableName("cnas_test")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="cnas测试参数列表")
@Schema(description = "cnas测试参数列表")
public class CnasTest implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**检测对象*/
@Excel(name = "检测对象", width = 15)
/**
* 检测对象
*/
@Excel(name = "检测对象", width = 15)
@Schema(description = "检测对象")
private String testTarget;
/**参数*/
@Excel(name = "参数", width = 15)
/**
* 参数
*/
@Excel(name = "参数", width = 15)
@Schema(description = "参数")
private String parameter;
/**检测标准*/
@Excel(name = "检测标准", width = 15)
/**
* 检测标准
*/
@Excel(name = "检测标准", width = 15)
@Schema(description = "检测标准")
private String testStandard;
/**创建时间*/
@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
/**
* 创建时间
*/
@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "创建时间")
private Date time;
}

View File

@@ -1,97 +1,126 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 元器件
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("component")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="元器件")
@Schema(description = "元器件")
public class Component implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**名称*/
@Excel(name = "名称", width = 15)
/**
* 名称
*/
@Excel(name = "名称", width = 15)
@Schema(description = "名称")
private String name;
/**型号*/
@Excel(name = "型号", width = 15)
/**
* 型号
*/
@Excel(name = "型号", width = 15)
@Schema(description = "型号")
private String model;
/**特征尺寸*/
@Excel(name = "特征尺寸", width = 15)
/**
* 特征尺寸
*/
@Excel(name = "特征尺寸", width = 15)
@Schema(description = "特征尺寸")
private String size;
/**器件材料*/
@Excel(name = "器件材料", width = 15)
/**
* 器件材料
*/
@Excel(name = "器件材料", width = 15)
@Schema(description = "器件材料")
private String material;
/**器件工艺*/
@Excel(name = "器件工艺", width = 15)
/**
* 器件工艺
*/
@Excel(name = "器件工艺", width = 15)
@Schema(description = "器件工艺")
private String technology;
/**生产厂家*/
@Excel(name = "生产厂家", width = 15)
/**
* 生产厂家
*/
@Excel(name = "生产厂家", width = 15)
@Schema(description = "生产厂家")
private String manufacturer;
/**批次*/
@Excel(name = "批次", width = 15)
/**
* 批次
*/
@Excel(name = "批次", width = 15)
@Schema(description = "批次")
private String batchNo;
/**代工线*/
@Excel(name = "代工线", width = 15)
/**
* 代工线
*/
@Excel(name = "代工线", width = 15)
@Schema(description = "代工线")
private String oemLine;
/**类型*/
@Excel(name = "类型", width = 15)
/**
* 类型
*/
@Excel(name = "类型", width = 15)
@Schema(description = "类型")
private String type;
/**附件*/
@Excel(name = "附件", width = 15)
/**
* 附件
*/
@Excel(name = "附件", width = 15)
@Schema(description = "附件")
private String attachment;
}

View File

@@ -1,65 +1,78 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 我的收藏文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("document_favorites")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="我的收藏文档")
@Schema(description = "我的收藏文档")
public class DocumentFavorites implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**文档ID*/
@Excel(name = "文档ID", width = 15)
/**
* 文档ID
*/
@Excel(name = "文档ID", width = 15)
@Schema(description = "文档ID")
private String documentId;
/**用户ID*/
@Excel(name = "用户ID", width = 15)
/**
* 用户ID
*/
@Excel(name = "用户ID", width = 15)
@Schema(description = "用户ID")
private String userId;
}

View File

@@ -1,81 +1,102 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 设备
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("equipment")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="设备")
@Schema(description = "设备")
public class Equipment implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**名称*/
@Excel(name = "名称", width = 15)
/**
* 名称
*/
@Excel(name = "名称", width = 15)
@Schema(description = "名称")
private String name;
/**型号*/
@Excel(name = "型号", width = 15)
/**
* 型号
*/
@Excel(name = "型号", width = 15)
@Schema(description = "型号")
private String model;
/**出厂编号*/
@Excel(name = "出厂编号", width = 15)
/**
* 出厂编号
*/
@Excel(name = "出厂编号", width = 15)
@Schema(description = "出厂编号")
private String factoryNo;
/**管理编号*/
@Excel(name = "管理编号", width = 15)
/**
* 管理编号
*/
@Excel(name = "管理编号", width = 15)
@Schema(description = "管理编号")
private String managementNo;
/**有效期*/
@Excel(name = "有效期", width = 15)
/**
* 有效期
*/
@Excel(name = "有效期", width = 15)
@Schema(description = "有效期")
private String expireDate;
/**房间号*/
@Excel(name = "房间号", width = 15)
/**
* 房间号
*/
@Excel(name = "房间号", width = 15)
@Schema(description = "房间号")
private String roomNo;
}

View File

@@ -1,109 +1,142 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 退火过程
* @Author: jeecg-boot
* @Date: 2024-10-23
* @Date: 2024-10-23
* @Version: V1.0
*/
@Data
@TableName("experiment_anneal_process")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="退火过程")
@Schema(description = "退火过程")
public class ExperimentAnnealProcess implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/** 辐照源*/
@Excel(name = " 辐照源", width = 15)
/**
* 辐照源
*/
@Excel(name = " 辐照源", width = 15)
@Schema(description = " 辐照源")
private String radiationSource;
/**计量率*/
@Excel(name = "计量率", width = 15)
/**
* 计量率
*/
@Excel(name = "计量率", width = 15)
@Schema(description = "计量率")
private String measurementRate;
/**辐照标准*/
@Excel(name = "辐照标准", width = 15)
/**
* 辐照标准
*/
@Excel(name = "辐照标准", width = 15)
@Schema(description = "辐照标准")
private String radiationStandard;
/**退火温度*/
@Excel(name = "退火温度", width = 15)
/**
* 退火温度
*/
@Excel(name = "退火温度", width = 15)
@Schema(description = "退火温度")
private String annealTemperature;
/**备注*/
@Excel(name = "备注", width = 15)
/**
* 备注
*/
@Excel(name = "备注", width = 15)
@Schema(description = "备注")
private String comment;
/**异常记录*/
@Excel(name = "异常记录", width = 15)
/**
* 异常记录
*/
@Excel(name = "异常记录", width = 15)
@Schema(description = "异常记录")
private String exceptionRecord;
/**辐照详情json存储*/
@Excel(name = "辐照详情json存储", width = 15)
/**
* 辐照详情json存储
*/
@Excel(name = "辐照详情json存储", width = 15)
@Schema(description = "辐照详情json存储")
private String radiationDetail;
/**试验ID*/
@Excel(name = "试验ID", width = 15)
/**
* 试验ID
*/
@Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID")
private String experimentId;
/**退火开始时间*/
@Excel(name = "退火开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 退火开始时间
*/
@Excel(name = "退火开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "退火开始时间")
private Date annealStartTime;
/**退火结束时间*/
@Excel(name = "退火结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 退火结束时间
*/
@Excel(name = "退火结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "退火结束时间")
private Date annealEndTime;
/**偏置条件*/
@Excel(name = "偏置条件", width = 15)
/**
* 偏置条件
*/
@Excel(name = "偏置条件", width = 15)
@Schema(description = "偏置条件(json 大字段)")
private String biasCondition;
/**加偏设备*/
@Excel(name = "加偏设备", width = 15)
/**
* 加偏设备
*/
@Excel(name = "加偏设备", width = 15)
@Schema(description = "加偏设备(json 大字段)")
private String biasEquipment;
}

View File

@@ -1,69 +1,84 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 试验文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("experiment_doc")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="试验文档")
@Schema(description = "试验文档")
public class ExperimentDoc implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**试验ID*/
@Excel(name = "试验ID", width = 15)
/**
* 试验ID
*/
@Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID")
private String experimentId;
/**文档类型*/
@Excel(name = "文档类型", width = 15)
/**
* 文档类型
*/
@Excel(name = "文档类型", width = 15)
@Schema(description = "文档类型")
private String docType;
/**文件地址*/
@Excel(name = "文件地址", width = 15)
/**
* 文件地址
*/
@Excel(name = "文件地址", width = 15)
@Schema(description = "文件地址")
private String filePath;
}

View File

@@ -1,65 +1,78 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 试验日志
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("experiment_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="试验日志")
@Schema(description = "试验日志")
public class ExperimentLog implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**试验ID*/
@Excel(name = "试验ID", width = 15)
/**
* 试验ID
*/
@Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID")
private String experimentId;
/**日志内容*/
@Excel(name = "日志内容", width = 15)
/**
* 日志内容
*/
@Excel(name = "日志内容", width = 15)
@Schema(description = "日志内容")
private String logContent;
}

View File

@@ -1,89 +1,114 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 辐照过程
* @Author: jeecg-boot
* @Date: 2024-10-15
* @Date: 2024-10-15
* @Version: V1.0
*/
@Data
@TableName("experiment_radiation_process")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="辐照过程")
@Schema(description = "辐照过程")
public class ExperimentRadiationProcess implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/** 辐照源*/
@Excel(name = " 辐照源", width = 15)
/**
* 辐照源
*/
@Excel(name = " 辐照源", width = 15)
@Schema(description = " 辐照源")
private String radiationSource;
/**计量率*/
@Excel(name = "计量率", width = 15)
/**
* 计量率
*/
@Excel(name = "计量率", width = 15)
@Schema(description = "计量率")
private String measurementRate;
/**辐照标准*/
@Excel(name = "辐照标准", width = 15)
/**
* 辐照标准
*/
@Excel(name = "辐照标准", width = 15)
@Schema(description = "辐照标准")
private String radiationStandard;
/**环境温度*/
@Excel(name = "环境温度", width = 15)
/**
* 环境温度
*/
@Excel(name = "环境温度", width = 15)
@Schema(description = "环境温度")
private String environmentalTemperature;
/**备注*/
@Excel(name = "备注", width = 15)
/**
* 备注
*/
@Excel(name = "备注", width = 15)
@Schema(description = "备注")
private String comment;
/**异常记录*/
@Excel(name = "异常记录", width = 15)
/**
* 异常记录
*/
@Excel(name = "异常记录", width = 15)
@Schema(description = "异常记录")
private String exceptionRecord;
/**辐照详情json存储*/
@Excel(name = "辐照详情json存储", width = 15)
/**
* 辐照详情json存储
*/
@Excel(name = "辐照详情json存储", width = 15)
@Schema(description = "辐照详情json存储")
private String radiationDetail;
/**试验ID*/
@Excel(name = "试验ID", width = 15)
/**
* 试验ID
*/
@Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID")
private String experimentId;
}

View File

@@ -0,0 +1,90 @@
package org.jeecg.modules.database.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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 org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 试验评定
* @Author: jeecg-boot
* @Date: 2024-11-05
* @Version: V1.0
*/
@Data
@TableName("experiment_review")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "试验评定")
public class ExperimentReview implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**
* 实验ID
*/
@Excel(name = "实验ID", width = 15)
@Schema(description = "实验ID")
private String experimentalId;
/**
* 评审流程
*/
@Excel(name = "评审流程", width = 15)
@Schema(description = "评审流程")
private String reviewProcess;
/**
* 评审详情(json大字段)
*/
@Excel(name = "评审详情(json大字段)", width = 15)
@Schema(description = "评审详情(json大字段)")
private String reviewDetail;
/**
* 评审结果
*/
@Excel(name = "评审结果", width = 15)
@Schema(description = "评审结果(合格/不合格)")
private String reviewResult;
}

View File

@@ -1,133 +1,178 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 测试过程
* @Author: jeecg-boot
* @Date: 2024-10-22
* @Date: 2024-10-22
* @Version: V1.0
*/
@Data
@TableName("experiment_test_process")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="测试过程")
@Schema(description = "测试过程")
public class ExperimentTestProcess implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/** 辐照源*/
@Excel(name = " 辐照源", width = 15)
/**
* 辐照源
*/
@Excel(name = " 辐照源", width = 15)
@Schema(description = " 辐照源")
private String radiationSource;
/**计量率*/
@Excel(name = "计量率", width = 15)
/**
* 计量率
*/
@Excel(name = "计量率", width = 15)
@Schema(description = "计量率")
private String measurementRate;
/**辐照标准*/
@Excel(name = "辐照标准", width = 15)
/**
* 辐照标准
*/
@Excel(name = "辐照标准", width = 15)
@Schema(description = "辐照标准")
private String radiationStandard;
/**环境温度*/
@Excel(name = "环境温度", width = 15)
/**
* 环境温度
*/
@Excel(name = "环境温度", width = 15)
@Schema(description = "环境温度")
private String environmentalTemperature;
/**备注*/
@Excel(name = "备注", width = 15)
/**
* 备注
*/
@Excel(name = "备注", width = 15)
@Schema(description = "备注")
private String comment;
/**异常记录*/
@Excel(name = "异常记录", width = 15)
/**
* 异常记录
*/
@Excel(name = "异常记录", width = 15)
@Schema(description = "异常记录")
private String exceptionRecord;
/**辐照详情json存储*/
@Excel(name = "辐照详情json存储", width = 15)
/**
* 辐照详情json存储
*/
@Excel(name = "辐照详情json存储", width = 15)
@Schema(description = "辐照详情json存储")
private String radiationDetail;
/**试验ID*/
@Excel(name = "试验ID", width = 15)
/**
* 试验ID
*/
@Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID")
private String experimentId;
/**测试开始时间*/
@Excel(name = "测试开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 测试开始时间
*/
@Excel(name = "测试开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "测试开始时间")
private Date testStartTime;
/**测试结束时间*/
@Excel(name = "测试结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 测试结束时间
*/
@Excel(name = "测试结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "测试结束时间")
private Date testEndTime;
/**环境湿度*/
@Excel(name = "环境湿度", width = 15)
/**
* 环境湿度
*/
@Excel(name = "环境湿度", width = 15)
@Schema(description = "环境湿度")
private String environmentalHumidity;
/**测试参数(json 大字段)*/
@Excel(name = "测试参数", width = 15)
/**
* 测试参数(json 大字段)
*/
@Excel(name = "测试参数", width = 15)
@Schema(description = "测试参数(json 大字段)")
private String testParameters;
/**测试设备(json 大字段)*/
@Excel(name = "测试设备", width = 15)
/**
* 测试设备(json 大字段)
*/
@Excel(name = "测试设备", width = 15)
@Schema(description = "测试设备(json 大字段)")
private String testEquipment;
/**测试计量点*/
@Excel(name = "测试计量点", width = 15)
/**
* 测试计量点
*/
@Excel(name = "测试计量点", width = 15)
@Schema(description = "测试计量点")
private String testMeteringPoint;
/**测试注量点*/
@Excel(name = "测试注量点", width = 15)
/**
* 测试注量点
*/
@Excel(name = "测试注量点", width = 15)
@Schema(description = "测试注量点")
private String testFluencePoint;
/**退火时长*/
@Excel(name = "退火时长", width = 15)
/**
* 退火时长
*/
@Excel(name = "退火时长", width = 15)
@Schema(description = "退火时长")
private String annealingDuration;
/**测试数据(json 大字段)*/
@Excel(name = "测试数据", width = 15)
/**
* 测试数据(json 大字段)
*/
@Excel(name = "测试数据", width = 15)
@Schema(description = "测试数据(json 大字段)")
private String testData;
/**测试结果*/
@Excel(name = "测试结果", width = 15)
/**
* 测试结果
*/
@Excel(name = "测试结果", width = 15)
@Schema(description = "测试结果")
private String testResult;
}

View File

@@ -1,69 +1,84 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 试验人员
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("experiment_user")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="试验人员")
@Schema(description = "试验人员")
public class ExperimentUser implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**试验ID*/
@Excel(name = "试验ID", width = 15)
/**
* 试验ID
*/
@Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID")
private String experimentId;
/**人员*/
@Excel(name = "人员", width = 15)
/**
* 人员
*/
@Excel(name = "人员", width = 15)
@Schema(description = "人员")
private String userId;
/**类型*/
@Excel(name = "类型", width = 15)
/**
* 类型
*/
@Excel(name = "类型", width = 15)
@Schema(description = "类型")
private String type;
}

View File

@@ -1,73 +1,90 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 辐照标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("irradiation_standards")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="辐照标准")
@Schema(description = "辐照标准")
public class IrradiationStandards implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**标准名称*/
@Excel(name = "标准名称", width = 15)
/**
* 标准名称
*/
@Excel(name = "标准名称", width = 15)
@Schema(description = "标准名称")
private String name;
/**标准代码*/
@Excel(name = "标准代码", width = 15)
/**
* 标准代码
*/
@Excel(name = "标准代码", width = 15)
@Schema(description = "标准代码")
private String code;
/**内容*/
@Excel(name = "内容", width = 15)
/**
* 内容
*/
@Excel(name = "内容", width = 15)
@Schema(description = "内容")
private String content;
/**附件*/
@Excel(name = "附件", width = 15)
/**
* 附件
*/
@Excel(name = "附件", width = 15)
@Schema(description = "附件")
private String attachment;
}

View File

@@ -1,85 +1,108 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 迁移数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
@Data
@TableName("migration_data_record")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="迁移数据管理")
@Schema(description = "迁移数据管理")
public class MigrationDataRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**试验类型*/
@Excel(name = "试验类型", width = 15)
/**
* 试验类型
*/
@Excel(name = "试验类型", width = 15)
@Schema(description = "试验类型")
private String type;
/**试验名称*/
@Excel(name = "试验名称", width = 15)
/**
* 试验名称
*/
@Excel(name = "试验名称", width = 15)
@Schema(description = "试验名称")
private String name;
/**委托方*/
@Excel(name = "委托方", width = 15)
/**
* 委托方
*/
@Excel(name = "委托方", width = 15)
@Schema(description = "委托方")
private String client;
/**生产厂家*/
@Excel(name = "生产厂家", width = 15)
/**
* 生产厂家
*/
@Excel(name = "生产厂家", width = 15)
@Schema(description = "生产厂家")
private String manufacturer;
/**试验时间*/
@Excel(name = "试验时间", width = 15)
/**
* 试验时间
*/
@Excel(name = "试验时间", width = 15)
@Schema(description = "试验时间")
private String experimentDate;
/**试验人员*/
@Excel(name = "试验人员", width = 15)
/**
* 试验人员
*/
@Excel(name = "试验人员", width = 15)
@Schema(description = "试验人员")
private String experimentUser;
/**实验详情(大字段)*/
@Excel(name = "实验详情(大字段)", width = 15)
/**
* 实验详情(大字段)
*/
@Excel(name = "实验详情(大字段)", width = 15)
@Schema(description = "实验详情(大字段)")
private String experimentDetail;
}

View File

@@ -1,101 +1,132 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: NASA数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
@Data
@TableName("nasa_data_record")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="NASA数据管理")
@Schema(description = "NASA数据管理")
public class NasaDataRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**器件类型*/
@Excel(name = "器件类型", width = 15)
/**
* 器件类型
*/
@Excel(name = "器件类型", width = 15)
@Schema(description = "器件类型")
private String deviceType;
/**器件名称*/
@Excel(name = "器件名称", width = 15)
/**
* 器件名称
*/
@Excel(name = "器件名称", width = 15)
@Schema(description = "器件名称")
private String deviceName;
/**器件型号*/
@Excel(name = "器件型号", width = 15)
/**
* 器件型号
*/
@Excel(name = "器件型号", width = 15)
@Schema(description = "器件型号")
private String deviceMode;
/**器件功能*/
@Excel(name = "器件功能", width = 15)
/**
* 器件功能
*/
@Excel(name = "器件功能", width = 15)
@Schema(description = "器件功能")
private String deviceFunction;
/**器件批次*/
@Excel(name = "器件批次", width = 15)
/**
* 器件批次
*/
@Excel(name = "器件批次", width = 15)
@Schema(description = "器件批次")
private String deviceBatch;
/**生产厂家*/
@Excel(name = "生产厂家", width = 15)
/**
* 生产厂家
*/
@Excel(name = "生产厂家", width = 15)
@Schema(description = "生产厂家")
private String manufacturer;
/**试验时间*/
@Excel(name = "试验时间", width = 15)
/**
* 试验时间
*/
@Excel(name = "试验时间", width = 15)
@Schema(description = "试验时间")
private String experimentDate;
/**数据来源*/
@Excel(name = "数据来源", width = 15)
/**
* 数据来源
*/
@Excel(name = "数据来源", width = 15)
@Schema(description = "数据来源")
private String dataSource;
/**试验人员*/
@Excel(name = "试验人员", width = 15)
/**
* 试验人员
*/
@Excel(name = "试验人员", width = 15)
@Schema(description = "试验人员")
private String experimentUser;
/**条目数统计*/
@Excel(name = "条目数统计", width = 15)
/**
* 条目数统计
*/
@Excel(name = "条目数统计", width = 15)
@Schema(description = "条目数统计")
private String totalCount;
/**附件IDs*/
@Excel(name = "附件IDs", width = 15)
/**
* 附件IDs
*/
@Excel(name = "附件IDs", width = 15)
@Schema(description = "附件IDs")
private String fileList;
}

View File

@@ -1,81 +1,102 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 辐射源类型
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("radiate_type")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="辐射源类型")
@Schema(description = "辐射源类型")
public class RadiateType implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**名称*/
@Excel(name = "名称", width = 15)
/**
* 名称
*/
@Excel(name = "名称", width = 15)
@Schema(description = "名称")
private String name;
/**型号*/
@Excel(name = "型号", width = 15)
/**
* 型号
*/
@Excel(name = "型号", width = 15)
@Schema(description = "型号")
private String model;
/**管理编号*/
@Excel(name = "管理编号", width = 15)
/**
* 管理编号
*/
@Excel(name = "管理编号", width = 15)
@Schema(description = "管理编号")
private String managementNo;
/**有效期*/
@Excel(name = "有效期", width = 15)
/**
* 有效期
*/
@Excel(name = "有效期", width = 15)
@Schema(description = "有效期")
private String expireDate;
/**房间号*/
@Excel(name = "房间号", width = 15)
/**
* 房间号
*/
@Excel(name = "房间号", width = 15)
@Schema(description = "房间号")
private String roomNo;
/**附件*/
@Excel(name = "附件", width = 15)
/**
* 附件
*/
@Excel(name = "附件", width = 15)
@Schema(description = "附件")
private String attachment;
}

View File

@@ -1,73 +1,90 @@
package org.jeecg.modules.database.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 测试标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Data
@TableName("test_standards")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="测试标准")
@Schema(description = "测试标准")
public class TestStandards implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**创建人*/
/**
* 创建人
*/
@Schema(description = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建日期")
private Date createTime;
/**更新人*/
/**
* 更新人
*/
@Schema(description = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新日期")
private Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@Schema(description = "所属部门")
private String sysOrgCode;
/**标准名称*/
@Excel(name = "标准名称", width = 15)
/**
* 标准名称
*/
@Excel(name = "标准名称", width = 15)
@Schema(description = "标准名称")
private String name;
/**标准代码*/
@Excel(name = "标准代码", width = 15)
/**
* 标准代码
*/
@Excel(name = "标准代码", width = 15)
@Schema(description = "标准代码")
private String code;
/**内容*/
@Excel(name = "内容", width = 15)
/**
* 内容
*/
@Excel(name = "内容", width = 15)
@Schema(description = "内容")
private String content;
/**附件*/
@Excel(name = "附件", width = 15)
/**
* 附件
*/
@Excel(name = "附件", width = 15)
@Schema(description = "附件")
private String attachment;
}

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.Client;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.Client;
/**
* @Description: 委托方
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ClientMapper extends BaseMapper<Client> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.CnasTest;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.CnasTest;
/**
* @Description: cnas测试参数列表
* @Author: jeecg-boot
* @Date: 2024-10-23
* @Date: 2024-10-23
* @Version: V1.0
*/
public interface CnasTestMapper extends BaseMapper<CnasTest> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.Component;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.Component;
/**
* @Description: 元器件
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ComponentMapper extends BaseMapper<Component> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.DocumentFavorites;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.DocumentFavorites;
/**
* @Description: 我的收藏文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface DocumentFavoritesMapper extends BaseMapper<DocumentFavorites> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.mapper;
import org.jeecg.modules.database.entity.DocumentLibrary;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.DocumentLibrary;
/**
* @Description: 知识库
* @Author: jeecg-boot
* @Date: 2024-08-21
* @Date: 2024-08-21
* @Version: V1.0
*/
public interface DocumentLibraryMapper extends BaseMapper<DocumentLibrary> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.Equipment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.Equipment;
/**
* @Description: 设备
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface EquipmentMapper extends BaseMapper<Equipment> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
/**
* @Description: 退火过程
* @Author: jeecg-boot
* @Date: 2024-10-21
* @Date: 2024-10-21
* @Version: V1.0
*/
public interface ExperimentAnnealProcessMapper extends BaseMapper<ExperimentAnnealProcess> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.ExperimentDoc;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentDoc;
/**
* @Description: 试验文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ExperimentDocMapper extends BaseMapper<ExperimentDoc> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.ExperimentLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentLog;
/**
* @Description: 试验日志
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ExperimentLogMapper extends BaseMapper<ExperimentLog> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.Experiment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.Experiment;
/**
* @Description: 试验管理
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ExperimentMapper extends BaseMapper<Experiment> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
/**
* @Description: 辐照过程
* @Author: jeecg-boot
* @Date: 2024-10-15
* @Date: 2024-10-15
* @Version: V1.0
*/
public interface ExperimentRadiationProcessMapper extends BaseMapper<ExperimentRadiationProcess> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.ExperimentReport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentReport;
/**
* @Description: 试验报告
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ExperimentReportMapper extends BaseMapper<ExperimentReport> {

View File

@@ -0,0 +1,14 @@
package org.jeecg.modules.database.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentReview;
/**
* @Description: 试验评定
* @Author: jeecg-boot
* @Date: 2024-11-05
* @Version: V1.0
*/
public interface ExperimentReviewMapper extends BaseMapper<ExperimentReview> {
}

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.ExperimentTestProcess;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentTestProcess;
/**
* @Description: 测试过程
* @Author: jeecg-boot
* @Date: 2024-10-15
* @Date: 2024-10-15
* @Version: V1.0
*/
public interface ExperimentTestProcessMapper extends BaseMapper<ExperimentTestProcess> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.ExperimentUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.ExperimentUser;
/**
* @Description: 试验人员
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ExperimentUserMapper extends BaseMapper<ExperimentUser> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.IrradiationStandards;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.IrradiationStandards;
/**
* @Description: 辐照标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IrradiationStandardsMapper extends BaseMapper<IrradiationStandards> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.MigrationDataRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.MigrationDataRecord;
/**
* @Description: 迁移数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
public interface MigrationDataRecordMapper extends BaseMapper<MigrationDataRecord> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.NasaDataRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.NasaDataRecord;
/**
* @Description: NASA数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
public interface NasaDataRecordMapper extends BaseMapper<NasaDataRecord> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.RadiateType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.RadiateType;
/**
* @Description: 辐射源类型
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface RadiateTypeMapper extends BaseMapper<RadiateType> {

View File

@@ -1,15 +1,12 @@
package org.jeecg.modules.database.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.database.entity.TestStandards;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.database.entity.TestStandards;
/**
* @Description: 测试标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface TestStandardsMapper extends BaseMapper<TestStandards> {

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.database.mapper.ExperimentReviewMapper">
</mapper>

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.Client;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.Client;
/**
* @Description: 委托方
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IClientService extends IService<Client> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.CnasTest;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.CnasTest;
/**
* @Description: cnas测试参数列表
* @Author: jeecg-boot
* @Date: 2024-10-23
* @Date: 2024-10-23
* @Version: V1.0
*/
public interface ICnasTestService extends IService<CnasTest> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.Component;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.Component;
/**
* @Description: 元器件
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IComponentService extends IService<Component> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.DocumentFavorites;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.DocumentFavorites;
/**
* @Description: 我的收藏文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IDocumentFavoritesService extends IService<DocumentFavorites> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.Equipment;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.Equipment;
/**
* @Description: 设备
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IEquipmentService extends IService<Equipment> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
/**
* @Description: 退火过程
* @Author: jeecg-boot
* @Date: 2024-10-21
* @Date: 2024-10-21
* @Version: V1.0
*/
public interface IExperimentAnnealProcessService extends IService<ExperimentAnnealProcess> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.ExperimentDoc;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentDoc;
/**
* @Description: 试验文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IExperimentDocService extends IService<ExperimentDoc> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.ExperimentLog;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentLog;
/**
* @Description: 试验日志
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IExperimentLogService extends IService<ExperimentLog> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
/**
* @Description: 辐照过程
* @Author: jeecg-boot
* @Date: 2024-10-15
* @Date: 2024-10-15
* @Version: V1.0
*/
public interface IExperimentRadiationProcessService extends IService<ExperimentRadiationProcess> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.ExperimentReport;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentReport;
/**
* @Description: 试验报告
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IExperimentReportService extends IService<ExperimentReport> {

View File

@@ -0,0 +1,14 @@
package org.jeecg.modules.database.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentReview;
/**
* @Description: 试验评定
* @Author: jeecg-boot
* @Date: 2024-11-05
* @Version: V1.0
*/
public interface IExperimentReviewService extends IService<ExperimentReview> {
}

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.Experiment;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.Experiment;
/**
* @Description: 试验管理
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IExperimentService extends IService<Experiment> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.ExperimentTestProcess;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentTestProcess;
/**
* @Description: 测试过程
* @Author: jeecg-boot
* @Date: 2024-10-15
* @Date: 2024-10-15
* @Version: V1.0
*/
public interface IExperimentTestProcessService extends IService<ExperimentTestProcess> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.ExperimentUser;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentUser;
/**
* @Description: 试验人员
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IExperimentUserService extends IService<ExperimentUser> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.IrradiationStandards;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.IrradiationStandards;
/**
* @Description: 辐照标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IIrradiationStandardsService extends IService<IrradiationStandards> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.MigrationDataRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.MigrationDataRecord;
/**
* @Description: 迁移数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
public interface IMigrationDataRecordService extends IService<MigrationDataRecord> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.NasaDataRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.NasaDataRecord;
/**
* @Description: NASA数据管理
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Date: 2024-11-04
* @Version: V1.0
*/
public interface INasaDataRecordService extends IService<NasaDataRecord> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.RadiateType;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.RadiateType;
/**
* @Description: 辐射源类型
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface IRadiateTypeService extends IService<RadiateType> {

View File

@@ -1,12 +1,12 @@
package org.jeecg.modules.database.service;
import org.jeecg.modules.database.entity.TestStandards;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.TestStandards;
/**
* @Description: 测试标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
public interface ITestStandardsService extends IService<TestStandards> {

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.Client;
import org.jeecg.modules.database.mapper.ClientMapper;
import org.jeecg.modules.database.service.IClientService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 委托方
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.CnasTest;
import org.jeecg.modules.database.mapper.CnasTestMapper;
import org.jeecg.modules.database.service.ICnasTestService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: cnas测试参数列表
* @Author: jeecg-boot
* @Date: 2024-10-23
* @Date: 2024-10-23
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.Component;
import org.jeecg.modules.database.mapper.ComponentMapper;
import org.jeecg.modules.database.service.IComponentService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 元器件
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.DocumentFavorites;
import org.jeecg.modules.database.mapper.DocumentFavoritesMapper;
import org.jeecg.modules.database.service.IDocumentFavoritesService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 我的收藏文档
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.DocumentLibrary;
import org.jeecg.modules.database.mapper.DocumentLibraryMapper;
import org.jeecg.modules.database.service.IDocumentLibraryService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 知识库
* @Author: jeecg-boot
* @Date: 2024-08-21
* @Date: 2024-08-21
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.Equipment;
import org.jeecg.modules.database.mapper.EquipmentMapper;
import org.jeecg.modules.database.service.IEquipmentService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 设备
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper;
import org.jeecg.modules.database.service.IExperimentAnnealProcessService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 退火过程
* @Author: jeecg-boot
* @Date: 2024-10-21
* @Date: 2024-10-21
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.ExperimentLog;
import org.jeecg.modules.database.mapper.ExperimentLogMapper;
import org.jeecg.modules.database.service.IExperimentLogService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 试验日志
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper;
import org.jeecg.modules.database.service.IExperimentRadiationProcessService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 辐照过程
* @Author: jeecg-boot
* @Date: 2024-10-15
* @Date: 2024-10-15
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.ExperimentReport;
import org.jeecg.modules.database.mapper.ExperimentReportMapper;
import org.jeecg.modules.database.service.IExperimentReportService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 试验报告
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -0,0 +1,18 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.ExperimentReview;
import org.jeecg.modules.database.mapper.ExperimentReviewMapper;
import org.jeecg.modules.database.service.IExperimentReviewService;
import org.springframework.stereotype.Service;
/**
* @Description: 试验评定
* @Author: jeecg-boot
* @Date: 2024-11-05
* @Version: V1.0
*/
@Service
public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewMapper, ExperimentReview> implements IExperimentReviewService {
}

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.Experiment;
import org.jeecg.modules.database.mapper.ExperimentMapper;
import org.jeecg.modules.database.service.IExperimentService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 试验管理
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.ExperimentTestProcess;
import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper;
import org.jeecg.modules.database.service.IExperimentTestProcessService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 测试过程
* @Author: jeecg-boot
* @Date: 2024-10-15
* @Date: 2024-10-15
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.ExperimentUser;
import org.jeecg.modules.database.mapper.ExperimentUserMapper;
import org.jeecg.modules.database.service.IExperimentUserService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 试验人员
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

View File

@@ -1,16 +1,15 @@
package org.jeecg.modules.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.IrradiationStandards;
import org.jeecg.modules.database.mapper.IrradiationStandardsMapper;
import org.jeecg.modules.database.service.IIrradiationStandardsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 辐照标准
* @Author: jeecg-boot
* @Date: 2024-08-30
* @Date: 2024-08-30
* @Version: V1.0
*/
@Service

Some files were not shown because too many files have changed in this diff Show More