wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitea.gentronhealth.com/py/his into develop

Browse Source
This commit is contained in:
nanyangbreeze
2025-12-31 13:37:29 +08:00
parent cf5dbc6133 b5ce854eb6
commit aeb6b95970
2599 changed files with 17276 additions and 11802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java
View File

@@ -11,6 +11,7 @@ import com.core.framework.web.service.SysLoginService;
import com.core.framework.web.service.SysPermissionService;
import com.core.framework.web.service.TokenService;
import com.core.system.service.ISysMenuService;
import com.core.system.service.ISysTenantService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +40,9 @@ public class SysLoginController {
@Autowired
private TokenService tokenService;
@Autowired
private ISysTenantService tenantService;
/**已评审
* 登录方法
*
@@ -72,12 +76,21 @@ public class SysLoginController {
loginUser.setPermissions(permissions);
tokenService.refreshToken(loginUser);
}
// 获取租户名称
String tenantName = null;
if (loginUser.getTenantId() != null) {
com.core.system.domain.SysTenant tenant = tenantService.getById(loginUser.getTenantId());
if (tenant != null) {
tenantName = tenant.getTenantName();
}
}
AjaxResult ajax = AjaxResult.success();
ajax.put("optionJson", loginUser.getOptionJson());
ajax.put("practitionerId", String.valueOf(loginUser.getPractitionerId()));
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
ajax.put("tenantName", tenantName);
return ajax;
}

154
openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java
View File

@@ -3,9 +3,12 @@ package com.core.web.controller.system;
import com.core.common.annotation.Log;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
import com.core.common.core.domain.entity.SysUser;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.core.page.TableDataInfo;
import com.core.common.enums.BusinessType;
import com.core.system.domain.SysNotice;
import com.core.system.service.ISysNoticeReadService;
import com.core.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +28,9 @@ public class SysNoticeController extends BaseController {
@Autowired
private ISysNoticeService noticeService;
@Autowired
private ISysNoticeReadService noticeReadService;
/**
* 获取通知公告列表
*/
@@ -36,6 +42,108 @@ public class SysNoticeController extends BaseController {
return getDataTable(list);
}
/**
* 获取当前用户的公告列表（公开接口）
* 公告类型：通常 noticeType = '1' 代表通知，noticeType = '2' 代表公告
*/
@GetMapping("/public/list")
public TableDataInfo getPublicList(SysNotice notice) {
// 只查询状态为正常（0）且已发布（1）的公告
notice.setStatus("0");
notice.setPublishStatus("1");
// 公告类型设置为 '2'（公告）
notice.setNoticeType("2");
// 设置分页参数
startPage();
List<SysNotice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
}
/**
* 获取当前用户的通知列表（公开接口）
* 通知类型：通常 noticeType = '1' 代表通知，noticeType = '2' 代表公告
* 返回已发布且状态正常的所有公告和通知，并标注已读状态
* 按优先级排序，高优先级在前
*/
@GetMapping("/public/notice")
public AjaxResult getUserNotices() {
// 获取当前用户信息
LoginUser loginUser = getLoginUser();
SysUser currentUser = loginUser.getUser();
// 查询已发布且状态正常的所有公告和通知
SysNotice notice = new SysNotice();
notice.setStatus("0");
notice.setPublishStatus("1");
List<SysNotice> list = noticeService.selectNoticeList(notice);
// 按优先级排序（1高 2中 3低），相同优先级按创建时间降序
list.sort((a, b) -> {
String priorityA = a.getPriority() != null ? a.getPriority() : "3";
String priorityB = b.getPriority() != null ? b.getPriority() : "3";
int priorityCompare = priorityA.compareTo(priorityB);
if (priorityCompare != 0) {
return priorityCompare;
}
// 相同优先级，按创建时间降序
return b.getCreateTime().compareTo(a.getCreateTime());
});
// 获取用户已读的公告/通知ID列表
List<Long> readIds = noticeReadService.selectReadNoticeIdsByUserId(currentUser.getUserId());
// 为每个公告/通知添加已读状态
for (SysNotice item : list) {
boolean isRead = readIds.contains(item.getNoticeId());
item.setIsRead(isRead);
}
return success(list);
}
/**
* 获取用户未读公告/通知数量（公开接口）
*/
@GetMapping("/public/unread/count")
public AjaxResult getUnreadCount() {
LoginUser loginUser = getLoginUser();
SysUser currentUser = loginUser.getUser();
int count = noticeReadService.getUnreadCount(currentUser.getUserId());
return success(count);
}
/**
* 标记公告/通知为已读（公开接口）
*/
@PostMapping("/public/read/{noticeId}")
public AjaxResult markAsRead(@PathVariable Long noticeId) {
LoginUser loginUser = getLoginUser();
SysUser currentUser = loginUser.getUser();
return noticeReadService.markAsRead(noticeId, currentUser.getUserId());
}
/**
* 批量标记公告/通知为已读（公开接口）
*/
@PostMapping("/public/read/all")
public AjaxResult markAllAsRead(@RequestBody Long[] noticeIds) {
LoginUser loginUser = getLoginUser();
SysUser currentUser = loginUser.getUser();
return noticeReadService.markAllAsRead(noticeIds, currentUser.getUserId());
}
/**
* 获取用户已读公告/通知ID列表（公开接口）
*/
@GetMapping("/public/read/ids")
public AjaxResult getReadNoticeIds() {
LoginUser loginUser = getLoginUser();
SysUser currentUser = loginUser.getUser();
List<Long> readIds = noticeReadService.selectReadNoticeIdsByUserId(currentUser.getUserId());
return success(readIds);
}
/**
* 根据通知公告编号获取详细信息
*/
@@ -53,6 +161,14 @@ public class SysNoticeController extends BaseController {
@PostMapping
public AjaxResult add(@Validated @RequestBody SysNotice notice) {
notice.setCreateBy(getUsername());
// 新建的公告默认为未发布状态
if (notice.getPublishStatus() == null || notice.getPublishStatus().isEmpty()) {
notice.setPublishStatus("0");
}
// 设置默认优先级为中（2）
if (notice.getPriority() == null || notice.getPriority().isEmpty()) {
notice.setPriority("2");
}
return toAjax(noticeService.insertNotice(notice));
}
@@ -76,4 +192,42 @@ public class SysNoticeController extends BaseController {
public AjaxResult remove(@PathVariable Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
/**
* 发布公告/通知
*/
@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "发布公告", businessType = BusinessType.UPDATE)
@PutMapping("/publish/{noticeId}")
public AjaxResult publish(@PathVariable Long noticeId) {
SysNotice notice = noticeService.selectNoticeById(noticeId);
if (notice == null) {
return error("公告不存在");
}
if ("1".equals(notice.getPublishStatus())) {
return error("该公告已发布");
}
notice.setPublishStatus("1");
notice.setUpdateBy(getUsername());
return toAjax(noticeService.updateNotice(notice));
}
/**
* 取消发布公告/通知
*/
@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "取消发布", businessType = BusinessType.UPDATE)
@PutMapping("/unpublish/{noticeId}")
public AjaxResult unpublish(@PathVariable Long noticeId) {
SysNotice notice = noticeService.selectNoticeById(noticeId);
if (notice == null) {
return error("公告不存在");
}
if ("0".equals(notice.getPublishStatus())) {
return error("该公告未发布");
}
notice.setPublishStatus("0");
notice.setUpdateBy(getUsername());
return toAjax(noticeService.updateNotice(notice));
}
}

8
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java
View File

@@ -1,12 +1,10 @@
package com.core.flowable.common.expand.el;
import javax.annotation.Resource;
import com.core.system.service.ISysDeptService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import com.core.system.service.ISysDeptService;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
/**
* 扩展表达式

33
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java
View File

@@ -1,22 +1,5 @@
package com.core.flowable.controller;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.core.common.annotation.Log;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
@@ -30,11 +13,25 @@ import com.core.system.domain.SysExpression;
import com.core.system.service.ISysExpressionService;
import com.core.system.service.ISysRoleService;
import com.core.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
/**
* <p>

10
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java
View File

@@ -1,21 +1,19 @@
package com.core.flowable.controller;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.core.common.annotation.Log;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
import com.core.common.enums.BusinessType;
import com.core.flowable.domain.vo.FlowTaskVo;
import com.core.flowable.service.IFlowInstanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* <p>

21
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java
View File

@@ -1,16 +1,5 @@
package com.core.flowable.controller;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.core.common.annotation.Log;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
@@ -19,11 +8,19 @@ import com.core.flowable.domain.dto.FlowTaskDto;
import com.core.flowable.domain.vo.FlowQueryVo;
import com.core.flowable.domain.vo.FlowTaskVo;
import com.core.flowable.service.IFlowTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
/**
* <p>

14
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java
View File

@@ -1,13 +1,5 @@
package com.core.flowable.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.core.common.annotation.Log;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
@@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType;
import com.core.common.utils.poi.ExcelUtil;
import com.core.system.domain.SysExpression;
import com.core.system.service.ISysExpressionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 流程达式Controller

11
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java
View File

@@ -1,11 +1,5 @@
package com.core.flowable.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.core.common.annotation.Log;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
@@ -16,6 +10,11 @@ import com.core.flowable.service.ISysDeployFormService;
import com.core.flowable.service.ISysFormService;
import com.core.system.domain.SysDeployForm;
import com.core.system.domain.SysForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 流程表单Controller

14
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java
View File

@@ -1,13 +1,5 @@
package com.core.flowable.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.core.common.annotation.Log;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
@@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType;
import com.core.common.utils.poi.ExcelUtil;
import com.core.system.domain.SysListener;
import com.core.system.service.ISysListenerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 流程监听Controller

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java
View File

@@ -1,10 +1,10 @@
package com.core.flowable.domain.dto;
import java.io.Serializable;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
/**
* @author system
* @date 2021/3/28 15:50

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java
View File

@@ -1,9 +1,9 @@
package com.core.flowable.domain.dto;
import java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
/**
* @author system
* @date 2021/3/31 23:20

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java
View File

@@ -1,9 +1,9 @@
package com.core.flowable.domain.dto;
import java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
/**
* 动态人员、组
*

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java
View File

@@ -1,9 +1,9 @@
package com.core.flowable.domain.dto;
import java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
/**
* @author system
* @date 2021/3/28 19:48

7
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java
View File

@@ -1,15 +1,14 @@
package com.core.flowable.domain.dto;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 工作流任务

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java
View File

@@ -1,9 +1,9 @@
package com.core.flowable.domain.dto;
import java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
/**
* @author system
* @date 2021/4/21 20:55

6
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java
View File

@@ -1,12 +1,12 @@
package com.core.flowable.domain.vo;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* <p>
* 流程任务

5
openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java
View File

@@ -1,12 +1,11 @@
package com.core.flowable.factory;
import javax.annotation.Resource;
import lombok.Getter;
import org.flowable.engine.*;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
import lombok.Getter;
import javax.annotation.Resource;
/**
* flowable 引擎注入封装

13
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java
View File

@@ -1,5 +1,11 @@
package com.core.flowable.flow;
import org.flowable.bpmn.model.AssociationDirection;
import org.flowable.bpmn.model.GraphicInfo;
import org.flowable.image.impl.DefaultProcessDiagramCanvas;
import org.flowable.image.util.ReflectUtil;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.font.FontRenderContext;
import java.awt.font.LineBreakMeasurer;
@@ -13,13 +19,6 @@ import java.io.IOException;
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
import javax.imageio.ImageIO;
import org.flowable.bpmn.model.AssociationDirection;
import org.flowable.bpmn.model.GraphicInfo;
import org.flowable.image.impl.DefaultProcessDiagramCanvas;
import org.flowable.image.util.ReflectUtil;
/**
* @author system
* @date 2021/4/4 23:58

6
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java
View File

@@ -1,13 +1,13 @@
package com.core.flowable.flow;
import java.util.Iterator;
import java.util.List;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.image.impl.DefaultProcessDiagramCanvas;
import org.flowable.image.impl.DefaultProcessDiagramGenerator;
import java.util.Iterator;
import java.util.List;
/**
* @author system
* @date 2021/4/5 0:31

13
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java
View File

@@ -1,17 +1,16 @@
package com.core.flowable.flow;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinition;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* @author system

7
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java
View File

@@ -1,8 +1,6 @@
package com.core.flowable.flow;
import java.util.*;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.*;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
@@ -10,7 +8,8 @@ import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.task.api.history.HistoricTaskInstance;
import lombok.extern.slf4j.Slf4j;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author system

3
openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java
View File

@@ -1,12 +1,11 @@
package com.core.flowable.listener;
import lombok.extern.slf4j.Slf4j;
import org.flowable.common.engine.api.delegate.Expression;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.ExecutionListener;
import org.springframework.stereotype.Component;
import lombok.extern.slf4j.Slf4j;
/**
* 执行监听器
*

3
openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java
View File

@@ -1,11 +1,10 @@
package com.core.flowable.listener;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.springframework.stereotype.Component;
import lombok.extern.slf4j.Slf4j;
/**
* 任务监听器
*

8
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java
View File

@@ -1,13 +1,13 @@
package com.core.flowable.service;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.AjaxResult;
import com.core.system.domain.FlowProcDefDto;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
/**
* @author system
* @date 2021-04-03 14:41

7
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java
View File

@@ -1,11 +1,10 @@
package com.core.flowable.service;
import java.util.Map;
import org.flowable.engine.history.HistoricProcessInstance;
import com.core.common.core.domain.AjaxResult;
import com.core.flowable.domain.vo.FlowTaskVo;
import org.flowable.engine.history.HistoricProcessInstance;
import java.util.Map;
/**
* @author system

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java
View File

@@ -1,11 +1,11 @@
package com.core.flowable.service;
import java.io.InputStream;
import com.core.common.core.domain.AjaxResult;
import com.core.flowable.domain.vo.FlowQueryVo;
import com.core.flowable.domain.vo.FlowTaskVo;
import java.io.InputStream;
/**
* @author system
* @date 2021-04-03 14:42

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java
View File

@@ -1,10 +1,10 @@
package com.core.flowable.service;
import java.util.List;
import com.core.system.domain.SysDeployForm;
import com.core.system.domain.SysForm;
import java.util.List;
/**
* 流程实例关联表单Service接口
*

4
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java
View File

@@ -1,9 +1,9 @@
package com.core.flowable.service;
import java.util.List;
import com.core.system.domain.SysForm;
import java.util.List;
/**
* 表单
*

39
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java
View File

@@ -1,25 +1,5 @@
package com.core.flowable.service.impl;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Resource;
import org.apache.commons.io.IOUtils;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.image.impl.DefaultProcessDiagramGenerator;
import org.flowable.task.api.Task;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.AjaxResult;
import com.core.common.core.domain.entity.SysUser;
@@ -37,8 +17,25 @@ import com.core.system.service.ISysDeptService;
import com.core.system.service.ISysUserService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.image.impl.DefaultProcessDiagramGenerator;
import org.flowable.task.api.Task;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* 流程定义

16
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java
View File

@@ -1,20 +1,18 @@
package com.core.flowable.service.impl;
import java.util.Map;
import java.util.Objects;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.engine.history.HistoricProcessInstance;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.core.common.core.domain.AjaxResult;
import com.core.common.utils.SecurityUtils;
import com.core.flowable.domain.vo.FlowTaskVo;
import com.core.flowable.factory.FlowServiceFactory;
import com.core.flowable.service.IFlowInstanceService;
import lombok.extern.slf4j.Slf4j;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.engine.history.HistoricProcessInstance;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Map;
import java.util.Objects;
/**
* <p>

75
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
View File

@@ -1,43 +1,5 @@
package com.core.flowable.service.impl;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.FlowableException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.engine.ProcessEngineConfiguration;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.impl.cmd.AddMultiInstanceExecutionCmd;
import org.flowable.engine.impl.cmd.DeleteMultiInstanceExecutionCmd;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.engine.task.Comment;
import org.flowable.identitylink.api.history.HistoricIdentityLink;
import org.flowable.image.ProcessDiagramGenerator;
import org.flowable.task.api.DelegationState;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference;
@@ -65,8 +27,43 @@ import com.core.flowable.service.ISysFormService;
import com.core.system.domain.SysForm;
import com.core.system.service.ISysRoleService;
import com.core.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.FlowableException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.engine.ProcessEngineConfiguration;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.impl.cmd.AddMultiInstanceExecutionCmd;
import org.flowable.engine.impl.cmd.DeleteMultiInstanceExecutionCmd;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.engine.task.Comment;
import org.flowable.identitylink.api.history.HistoricIdentityLink;
import org.flowable.image.ProcessDiagramGenerator;
import org.flowable.task.api.DelegationState;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
* @author system

11
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java
View File

@@ -1,15 +1,14 @@
package com.core.flowable.service.impl;
import java.util.List;
import java.util.Objects;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.core.flowable.service.ISysDeployFormService;
import com.core.system.domain.SysDeployForm;
import com.core.system.domain.SysForm;
import com.core.system.mapper.SysDeployFormMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
/**
* 流程实例关联表单Service业务层处理

9
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java
View File

@@ -1,14 +1,13 @@
package com.core.flowable.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.core.common.utils.DateUtils;
import com.core.flowable.service.ISysFormService;
import com.core.system.domain.SysForm;
import com.core.system.mapper.SysFormMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 流程表单Service业务层处理

15
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java
View File

@@ -1,13 +1,5 @@
package com.core.framework.aspectj;
import java.util.ArrayList;
import java.util.List;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
import com.core.common.annotation.DataScope;
import com.core.common.constant.UserConstants;
import com.core.common.core.domain.BaseEntity;
@@ -18,6 +10,13 @@ import com.core.common.core.text.Convert;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.core.framework.security.context.PermissionContextHolder;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
/**
* 数据过滤处理

9
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java
View File

@@ -1,7 +1,8 @@
package com.core.framework.aspectj;
import java.util.Objects;
import com.core.common.annotation.DataSource;
import com.core.common.utils.StringUtils;
import com.core.framework.datasource.DynamicDataSourceContextHolder;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -13,9 +14,7 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import com.core.common.annotation.DataSource;
import com.core.common.utils.StringUtils;
import com.core.framework.datasource.DynamicDataSourceContextHolder;
import java.util.Objects;
/**
* 多数据源处理

36
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java
View File

@@ -1,24 +1,5 @@
package com.core.framework.aspectj;
import java.util.Collection;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.NamedThreadLocal;
import org.springframework.stereotype.Component;
import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson2.JSON;
import com.core.common.annotation.Log;
import com.core.common.core.domain.entity.SysUser;
@@ -33,6 +14,23 @@ import com.core.common.utils.ip.IpUtils;
import com.core.framework.manager.AsyncManager;
import com.core.framework.manager.factory.AsyncFactory;
import com.core.system.domain.SysOperLog;
import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.NamedThreadLocal;
import org.springframework.stereotype.Component;
import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Collection;
import java.util.Map;
/**
* 操作日志记录处理

17
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java
View File

@@ -1,9 +1,10 @@
package com.core.framework.aspectj;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import com.core.common.annotation.RateLimiter;
import com.core.common.enums.LimitType;
import com.core.common.exception.ServiceException;
import com.core.common.utils.StringUtils;
import com.core.common.utils.ip.IpUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -15,11 +16,9 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.script.RedisScript;
import org.springframework.stereotype.Component;
import com.core.common.annotation.RateLimiter;
import com.core.common.enums.LimitType;
import com.core.common.exception.ServiceException;
import com.core.common.utils.StringUtils;
import com.core.common.utils.ip.IpUtils;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
/**
* 限流处理

4
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
View File

@@ -1,13 +1,13 @@
package com.core.framework.config;
import java.util.TimeZone;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import java.util.TimeZone;
/**
* 程序注解配置
*

13
openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java
View File

@@ -1,14 +1,13 @@
package com.core.framework.config;
import static com.google.code.kaptcha.Constants.*;
import java.util.Properties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
import static com.google.code.kaptcha.Constants.*;
/**
* 验证码配置

26
openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java
View File

@@ -1,19 +1,5 @@
package com.core.framework.config;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.*;
import javax.sql.DataSource;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
@@ -22,6 +8,18 @@ import com.core.common.enums.DataSourceType;
import com.core.common.utils.spring.SpringUtils;
import com.core.framework.config.properties.DruidProperties;
import com.core.framework.datasource.DynamicDataSource;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import javax.servlet.*;
import javax.sql.DataSource;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
/**
* druid 配置多数据源

9
openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java
View File

@@ -1,15 +1,14 @@
package com.core.framework.config;
import java.nio.charset.Charset;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.SerializationException;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONReader;
import com.alibaba.fastjson2.JSONWriter;
import com.alibaba.fastjson2.filter.Filter;
import com.core.common.constant.Constants;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.SerializationException;
import java.nio.charset.Charset;
/**
* Redis使用FastJson序列化

14
openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java
View File

@@ -1,19 +1,17 @@
package com.core.framework.config;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.DispatcherType;
import com.core.common.filter.RepeatableFilter;
import com.core.common.filter.XssFilter;
import com.core.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.core.common.filter.RepeatableFilter;
import com.core.common.filter.XssFilter;
import com.core.common.utils.StringUtils;
import javax.servlet.DispatcherType;
import java.util.HashMap;
import java.util.Map;
/**
* Filter配置

3
openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java
View File

@@ -1,5 +1,6 @@
package com.core.framework.config;
import com.core.common.constant.Constants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.LocaleResolver;
@@ -8,8 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
import com.core.common.constant.Constants;
/**
* 资源文件配置加载
*

4
openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java
View File

@@ -1,9 +1,9 @@
package com.core.framework.config;
import java.util.Random;
import com.google.code.kaptcha.text.impl.DefaultTextCreator;
import java.util.Random;
/**
* 验证码文本生成器
*

23
openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
View File

@@ -1,17 +1,5 @@
package com.core.framework.config;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
@@ -20,9 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInt
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.core.common.utils.SecurityUtils;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@EnableTransactionManagement(proxyTargetClass = true)
@Configuration

9
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java
View File

@@ -1,7 +1,8 @@
package com.core.framework.config;
import java.util.concurrent.TimeUnit;
import com.core.common.config.CoreConfig;
import com.core.common.constant.Constants;
import com.core.framework.interceptor.RepeatSubmitInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -13,9 +14,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import com.core.common.config.CoreConfig;
import com.core.common.constant.Constants;
import com.core.framework.interceptor.RepeatSubmitInterceptor;
import java.util.concurrent.TimeUnit;
/**
* 通用配置

9
openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java
View File

@@ -1,5 +1,9 @@
package com.core.framework.config;
import com.core.framework.config.properties.PermitAllUrlProperties;
import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
import com.core.framework.security.handle.AuthenticationEntryPointImpl;
import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -17,11 +21,6 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
import org.springframework.security.web.authentication.logout.LogoutFilter;
import org.springframework.web.filter.CorsFilter;
import com.core.framework.config.properties.PermitAllUrlProperties;
import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
import com.core.framework.security.handle.AuthenticationEntryPointImpl;
import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
/**
* spring security配置
*

5
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java
View File

@@ -1,10 +1,9 @@
package com.core.framework.config;
import javax.servlet.http.HttpServletRequest;
import com.core.common.utils.ServletUtils;
import org.springframework.stereotype.Component;
import com.core.common.utils.ServletUtils;
import javax.servlet.http.HttpServletRequest;
/**
* 服务相关配置

9
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java
View File

@@ -1,15 +1,14 @@
package com.core.framework.config;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadPoolExecutor;
import com.core.common.utils.Threads;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import com.core.common.utils.Threads;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadPoolExecutor;
/**
* 线程池配置

3
openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java
View File

@@ -1,10 +1,9 @@
package com.core.framework.config.properties;
import com.alibaba.druid.pool.DruidDataSource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import com.alibaba.druid.pool.DruidDataSource;
/**
* druid 配置属性
*

7
openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java
View File

@@ -1,8 +1,6 @@
package com.core.framework.config.properties;
import java.util.*;
import java.util.regex.Pattern;
import com.core.common.annotation.Anonymous;
import org.apache.commons.lang3.RegExUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
@@ -14,7 +12,8 @@ import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import com.core.common.annotation.Anonymous;
import java.util.*;
import java.util.regex.Pattern;
/**
* 设置Anonymous注解允许匿名访问的url

5
openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java
View File

@@ -1,10 +1,9 @@
package com.core.framework.datasource;
import java.util.Map;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import javax.sql.DataSource;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import java.util.Map;
/**
* 动态数据源

16
openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java
View File

@@ -1,18 +1,16 @@
package com.core.framework.handler;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.utils.SecurityUtils;
import com.core.framework.config.TenantContext;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
@Component
public class MybastisColumnsHandler implements MetaObjectHandler {

16
openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java
View File

@@ -1,18 +1,16 @@
package com.core.framework.interceptor;
import java.lang.reflect.Method;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import com.alibaba.fastjson2.JSON;
import com.core.common.annotation.RepeatSubmit;
import com.core.common.core.domain.AjaxResult;
import com.core.common.utils.ServletUtils;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
/**
* 防止重复提交拦截器

18
openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java
View File

@@ -1,15 +1,5 @@
package com.core.framework.interceptor.impl;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON;
import com.core.common.annotation.RepeatSubmit;
import com.core.common.constant.CacheConstants;
@@ -18,6 +8,14 @@ import com.core.common.filter.RepeatedlyRequestWrapper;
import com.core.common.utils.StringUtils;
import com.core.common.utils.http.HttpHelper;
import com.core.framework.interceptor.RepeatSubmitInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* 判断请求url和数据是否和上一次相同， 如果和上次相同，则是重复提交表单。 有效时间为10秒内。

6
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java
View File

@@ -1,12 +1,12 @@
package com.core.framework.manager;
import com.core.common.utils.Threads;
import com.core.common.utils.spring.SpringUtils;
import java.util.TimerTask;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import com.core.common.utils.Threads;
import com.core.common.utils.spring.SpringUtils;
/**
* 异步任务管理器
*

4
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java
View File

@@ -1,11 +1,11 @@
package com.core.framework.manager;
import javax.annotation.PreDestroy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
/**
* 确保应用退出时能关闭后台线程
*

10
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java
View File

@@ -1,10 +1,5 @@
package com.core.framework.manager.factory;
import java.util.TimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.core.common.constant.Constants;
import com.core.common.utils.LogUtils;
import com.core.common.utils.ServletUtils;
@@ -16,8 +11,11 @@ import com.core.system.domain.SysLogininfor;
import com.core.system.domain.SysOperLog;
import com.core.system.service.ISysLogininforService;
import com.core.system.service.ISysOperLogService;
import eu.bitwalker.useragentutils.UserAgent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.TimerTask;
/**
* 异步工厂（产生任务用）

3
openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java
View File

@@ -1,10 +1,9 @@
package com.core.framework.security.context;
import com.core.common.core.text.Convert;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import com.core.common.core.text.Convert;
/**
* 权限信息
*

20
openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java
View File

@@ -1,12 +1,9 @@
package com.core.framework.security.filter;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.core.framework.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -14,10 +11,11 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.core.framework.web.service.TokenService;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* token过滤器 验证token有效性

18
openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java
View File

@@ -1,20 +1,18 @@
package com.core.framework.security.handle;
import java.io.IOException;
import java.io.Serializable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON;
import com.core.common.constant.HttpStatus;
import com.core.common.core.domain.AjaxResult;
import com.core.common.utils.ServletUtils;
import com.core.common.utils.StringUtils;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Serializable;
/**
* 认证失败处理类 返回未授权

20
openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java
View File

@@ -1,16 +1,5 @@
package com.core.framework.security.handle;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import com.alibaba.fastjson2.JSON;
import com.core.common.constant.Constants;
import com.core.common.core.domain.AjaxResult;
@@ -21,6 +10,15 @@ import com.core.common.utils.StringUtils;
import com.core.framework.manager.AsyncManager;
import com.core.framework.manager.factory.AsyncFactory;
import com.core.framework.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* 自定义退出处理类 返回成功

11
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java
View File

@@ -1,14 +1,8 @@
package com.core.framework.web.domain;
import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import com.core.common.utils.Arith;
import com.core.common.utils.ip.IpUtils;
import com.core.framework.web.domain.server.*;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
import oshi.hardware.CentralProcessor.TickType;
@@ -19,6 +13,11 @@ import oshi.software.os.OSFileStore;
import oshi.software.os.OperatingSystem;
import oshi.util.Util;
import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
/**
* 服务器相关信息
*

4
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java
View File

@@ -1,10 +1,10 @@
package com.core.framework.web.domain.server;
import java.lang.management.ManagementFactory;
import com.core.common.utils.Arith;
import com.core.common.utils.DateUtils;
import java.lang.management.ManagementFactory;
/**
* JVM相关信息
*

19
openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java
View File

@@ -1,7 +1,13 @@
package com.core.framework.web.exception;
import javax.servlet.http.HttpServletRequest;
import com.core.common.constant.HttpStatus;
import com.core.common.core.domain.AjaxResult;
import com.core.common.core.text.Convert;
import com.core.common.exception.DemoModeException;
import com.core.common.exception.NonCaptureException;
import com.core.common.exception.ServiceException;
import com.core.common.utils.StringUtils;
import com.core.common.utils.html.EscapeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.AccessDeniedException;
@@ -13,14 +19,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
import com.core.common.constant.HttpStatus;
import com.core.common.core.domain.AjaxResult;
import com.core.common.core.text.Convert;
import com.core.common.exception.DemoModeException;
import com.core.common.exception.NonCaptureException;
import com.core.common.exception.ServiceException;
import com.core.common.utils.StringUtils;
import com.core.common.utils.html.EscapeUtil;
import javax.servlet.http.HttpServletRequest;
/**
* 全局异常处理器

9
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java
View File

@@ -1,16 +1,15 @@
package com.core.framework.web.service;
import java.util.Set;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import com.core.common.constant.Constants;
import com.core.common.core.domain.entity.SysRole;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.core.framework.security.context.PermissionContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Set;
/**
* 首创 自定义权限实现，ss取自SpringSecurity首字母

26
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
View File

@@ -1,19 +1,5 @@
package com.core.framework.web.service;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import javax.annotation.Resource;
import com.core.common.enums.DelFlag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSONObject;
import com.core.common.constant.CacheConstants;
import com.core.common.constant.Constants;
@@ -24,6 +10,7 @@ import com.core.common.core.domain.entity.SysUser;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.core.domain.model.LoginUserExtend;
import com.core.common.core.redis.RedisCache;
import com.core.common.enums.DelFlag;
import com.core.common.enums.TenantStatus;
import com.core.common.exception.ServiceException;
import com.core.common.exception.user.*;
@@ -39,6 +26,17 @@ import com.core.system.service.ISysConfigService;
import com.core.system.service.ISysTenantOptionService;
import com.core.system.service.ISysTenantService;
import com.core.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/**
* 登录校验方法

13
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java
View File

@@ -1,12 +1,5 @@
package com.core.framework.web.service;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import com.core.common.constant.CacheConstants;
import com.core.common.core.domain.entity.SysUser;
import com.core.common.core.redis.RedisCache;
@@ -14,6 +7,12 @@ import com.core.common.exception.user.UserPasswordNotMatchException;
import com.core.common.exception.user.UserPasswordRetryLimitExceedException;
import com.core.common.utils.SecurityUtils;
import com.core.framework.security.context.AuthenticationContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import java.util.concurrent.TimeUnit;
/**
* 登录密码方法

15
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
View File

@@ -1,19 +1,18 @@
package com.core.framework.web.service;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import com.core.common.constant.UserConstants;
import com.core.common.core.domain.entity.SysRole;
import com.core.common.core.domain.entity.SysUser;
import com.core.common.utils.StringUtils;
import com.core.system.service.ISysMenuService;
import com.core.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* 用户权限处理

5
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java
View File

@@ -1,8 +1,5 @@
package com.core.framework.web.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.core.common.constant.CacheConstants;
import com.core.common.constant.Constants;
import com.core.common.constant.UserConstants;
@@ -18,6 +15,8 @@ import com.core.framework.manager.AsyncManager;
import com.core.framework.manager.factory.AsyncFactory;
import com.core.system.service.ISysConfigService;
import com.core.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 注册校验方法

23
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java
View File

@@ -1,17 +1,5 @@
package com.core.framework.web.service;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.core.common.constant.CacheConstants;
import com.core.common.constant.Constants;
import com.core.common.core.domain.model.LoginUser;
@@ -21,11 +9,20 @@ import com.core.common.utils.StringUtils;
import com.core.common.utils.ip.AddressUtils;
import com.core.common.utils.ip.IpUtils;
import com.core.common.utils.uuid.IdUtils;
import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* token验证处理

15
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java
View File

@@ -1,13 +1,5 @@
package com.core.framework.web.service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import com.core.common.core.domain.entity.SysUser;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.enums.UserStatus;
@@ -15,6 +7,13 @@ import com.core.common.exception.ServiceException;
import com.core.common.utils.MessageUtils;
import com.core.common.utils.StringUtils;
import com.core.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
/**
* 用户验证处理

36
openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java
View File

@@ -1,24 +1,5 @@
package com.core.generator.controller;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
@@ -36,6 +17,23 @@ import com.core.generator.domain.GenTable;
import com.core.generator.domain.GenTableColumn;
import com.core.generator.service.IGenTableColumnService;
import com.core.generator.service.IGenTableService;
import org.apache.commons.io.IOUtils;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 代码生成 操作处理

12
openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java
View File

@@ -1,15 +1,13 @@
package com.core.generator.domain;
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import org.apache.commons.lang3.ArrayUtils;
import com.core.common.constant.GenConstants;
import com.core.common.core.domain.BaseEntity;
import com.core.common.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* 业务表 gen_table

4
openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java
View File

@@ -1,10 +1,10 @@
package com.core.generator.domain;
import javax.validation.constraints.NotBlank;
import com.core.common.core.domain.BaseEntity;
import com.core.common.utils.StringUtils;
import javax.validation.constraints.NotBlank;
/**
* 代码生成业务字段表 gen_table_column
*

4
openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java
View File

@@ -1,9 +1,9 @@
package com.core.generator.mapper;
import java.util.List;
import com.core.generator.domain.GenTableColumn;
import java.util.List;
/**
* 业务字段 数据层
*

4
openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java
View File

@@ -1,9 +1,9 @@
package com.core.generator.mapper;
import java.util.List;
import com.core.generator.domain.GenTable;
import java.util.List;
/**
* 业务 数据层
*

9
openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java
View File

@@ -1,13 +1,12 @@
package com.core.generator.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.core.common.core.text.Convert;
import com.core.generator.domain.GenTableColumn;
import com.core.generator.mapper.GenTableColumnMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 业务字段 服务层实现

45
openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java
View File

@@ -1,28 +1,5 @@
package com.core.generator.service;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.core.common.constant.Constants;
@@ -37,6 +14,28 @@ import com.core.generator.mapper.GenTableMapper;
import com.core.generator.util.GenUtils;
import com.core.generator.util.VelocityInitializer;
import com.core.generator.util.VelocityUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
/**
* 业务 服务层实现

4
openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java
View File

@@ -1,9 +1,9 @@
package com.core.generator.service;
import java.util.List;
import com.core.generator.domain.GenTableColumn;
import java.util.List;
/**
* 业务字段 服务层
*

4
openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableService.java
View File

@@ -1,10 +1,10 @@
package com.core.generator.service;
import com.core.generator.domain.GenTable;
import java.util.List;
import java.util.Map;
import com.core.generator.domain.GenTable;
/**
* 业务 服务层
*

7
openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java
View File

@@ -1,14 +1,13 @@
package com.core.generator.util;
import java.util.Arrays;
import org.apache.commons.lang3.RegExUtils;
import com.core.common.constant.GenConstants;
import com.core.common.utils.StringUtils;
import com.core.generator.config.GenConfig;
import com.core.generator.domain.GenTable;
import com.core.generator.domain.GenTableColumn;
import org.apache.commons.lang3.RegExUtils;
import java.util.Arrays;
/**
* 代码生成器 工具类

5
openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java
View File

@@ -1,10 +1,9 @@
package com.core.generator.util;
import java.util.Properties;
import com.core.common.constant.Constants;
import org.apache.velocity.app.Velocity;
import com.core.common.constant.Constants;
import java.util.Properties;
/**
* VelocityEngine工厂

13
openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java
View File

@@ -1,12 +1,5 @@
package com.core.generator.util;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.core.common.constant.GenConstants;
@@ -14,6 +7,12 @@ import com.core.common.utils.DateUtils;
import com.core.common.utils.StringUtils;
import com.core.generator.domain.GenTable;
import com.core.generator.domain.GenTableColumn;
import org.apache.velocity.VelocityContext;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* 模板处理工具类

14
openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java
View File

@@ -1,13 +1,5 @@
package com.core.quartz.domain;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.annotation.Excel.ColumnType;
import com.core.common.constant.ScheduleConstants;
@@ -15,6 +7,12 @@ import com.core.common.core.domain.BaseEntity;
import com.core.common.utils.StringUtils;
import com.core.quartz.util.CronUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
/**
* 定时任务调度表 sys_job

9
openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java
View File

@@ -1,12 +1,11 @@
package com.core.quartz.domain;
import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 定时任务调度日志表 sys_job_log

4
openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java
View File

@@ -1,9 +1,9 @@
package com.core.quartz.mapper;
import java.util.List;
import com.core.quartz.domain.SysJobLog;
import java.util.List;
/**
* 调度任务日志信息 数据层
*

4
openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java
View File

@@ -1,9 +1,9 @@
package com.core.quartz.mapper;
import java.util.List;
import com.core.quartz.domain.SysJob;
import java.util.List;
/**
* 调度任务信息 数据层
*

8
openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java
View File

@@ -1,14 +1,14 @@
package com.core.quartz.util;
import com.core.common.utils.StringUtils;
import com.core.common.utils.spring.SpringUtils;
import com.core.quartz.domain.SysJob;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
import com.core.common.utils.StringUtils;
import com.core.common.utils.spring.SpringUtils;
import com.core.quartz.domain.SysJob;
/**
* 任务执行工具
*

7
openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java
View File

@@ -1,16 +1,15 @@
package com.core.system.domain;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 流程定义

11
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java
View File

@@ -1,14 +1,13 @@
package com.core.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.annotation.Excel.ColumnType;
import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* 参数配置表 sys_config

5
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysDeployForm.java
View File

@@ -1,10 +1,9 @@
package com.core.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 流程实例关联表单对象 sys_instance_form

5
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysExpression.java
View File

@@ -1,10 +1,9 @@
package com.core.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 流程达式对象 sys_expression

5
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysForm.java
View File

@@ -1,10 +1,9 @@
package com.core.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 流程表单对象 sys_task_form

5
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysListener.java
View File

@@ -1,10 +1,9 @@
package com.core.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 流程监听对象 sys_listener

4
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysLogininfor.java
View File

@@ -1,12 +1,12 @@
package com.core.system.domain;
import java.util.Date;
import com.core.common.annotation.Excel;
import com.core.common.annotation.Excel.ColumnType;
import com.core.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
* 系统访问记录表 sys_logininfor
*

44
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java
View File

@@ -1,13 +1,12 @@
package com.core.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.core.domain.BaseEntity;
import com.core.common.xss.Xss;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* 通知公告表 sys_notice
@@ -32,6 +31,15 @@ public class SysNotice extends BaseEntity {
/** 公告状态（0正常 1关闭） */
private String status;
/** 发布状态（0未发布 1已发布） */
private String publishStatus;
/** 优先级（1高 2中 3低） */
private String priority;
/** 是否已读（前端展示用，不映射到数据库） */
private Boolean isRead;
public Long getNoticeId() {
return noticeId;
}
@@ -75,6 +83,30 @@ public class SysNotice extends BaseEntity {
this.status = status;
}
public String getPublishStatus() {
return publishStatus;
}
public void setPublishStatus(String publishStatus) {
this.publishStatus = publishStatus;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public Boolean getIsRead() {
return isRead;
}
public void setIsRead(Boolean isRead) {
this.isRead = isRead;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("noticeId", getNoticeId())

61
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNoticeRead.java Normal file
View File

@@ -0,0 +1,61 @@
package com.core.system.domain;
import com.core.common.core.domain.BaseEntity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 公告/通知已读记录 sys_notice_read
*
* @author system
*/
public class SysNoticeRead extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 阅读ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long readId;
/** 公告/通知ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long noticeId;
/** 用户ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/** 阅读时间 */
private String readTime;
public Long getReadId() {
return readId;
}
public void setReadId(Long readId) {
this.readId = readId;
}
public Long getNoticeId() {
return noticeId;
}
public void setNoticeId(Long noticeId) {
this.noticeId = noticeId;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getReadTime() {
return readTime;
}
public void setReadTime(String readTime) {
this.readTime = readTime;
}
}

4
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysOperLog.java
View File

@@ -1,12 +1,12 @@
package com.core.system.domain;
import java.util.Date;
import com.core.common.annotation.Excel;
import com.core.common.annotation.Excel.ColumnType;
import com.core.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
* 操作日志记录表 oper_log
*

13
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java
View File

@@ -1,15 +1,14 @@
package com.core.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.core.common.annotation.Excel;
import com.core.common.annotation.Excel.ColumnType;
import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
* 岗位表 sys_post

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