linjj
/
docus-collector2.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改userviewjob保存逻辑和basicdatareveive.jar保持一致

Browse Source
segment2.0
linrf 2 years ago
parent 35a5d7038d
commit 0347e222a5
12 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File

37
collect-sdry/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -13,78 +13,78 @@ spring:
#公司病案的数据库
master:
url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
username: docus
password: docus702
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#医院的用户/科室/基础数据的数据库
his:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#病理数据
bl:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#电生理系统数据
ecg:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#电子病历系统数据
emr:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#护理文书系统数据
hl:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#手麻系统数据
issubmit:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#lis系统数据
lis:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#Pacs系统数据视图
pacs:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#vte静脉血栓栓塞症
vte:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
#重症系统数据
zz:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root@123456
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
# rabbitmq:
@ -94,7 +94,7 @@ spring:
# password: guest
redis:
host: redis.docus.cn
# password: JSdocus@702
password: JSdocus@702
cloud:
nacos:
discovery:
@ -109,6 +109,9 @@ spring:
docus:
dbtype: mysql
user:
# 用户默认密码
defpwd: fd29cd53ec12616e5f36b77d4afffbff
mybatis-plus:
configuration:
@ -137,14 +140,6 @@ xxl:
logretentiondays: 30
logpath: D:/xxl-job/inspection
api:
soft-delete-column-name=state
soft-delete-column-value=1
logging:
level:
com:
baomidou:
mybatisplus: DEBUG
#
#ibm:
# mq:

3
common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.docus.server.collect.user.view;
import com.docus.core.util.ListUtils;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.his.service.IHisService;
@ -31,7 +32,6 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
super.startCollectAll(getJobParam());
}
/**
* xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
*/
@ -42,6 +42,7 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
@Override
public void batchInsertOrUpdate(List<UserDTO> t) {
List<String> userNames = ListUtils.distinctSelect(t, UserDTO::getUserName);
userService.batchInsertOrUpdatePowerUser(t);
}

4
common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java
Unescape Escape View File

@ -65,9 +65,9 @@ public class TaskConfig {
private StateEnum state = StateEnum.OK;
/**
* 失败信息
* 上回失败信息
*/
private String errorMsg;
private String lastErrorMsg;
public List<PeriodTime> getAllPeriodTimes() {
List<PeriodTime> periodTimes = DateSpiltUtil.spiltDate(this.getStartTime(), this.endTime, 1000 * spiltPeriod);

33
common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java
Unescape Escape View File

@ -10,12 +10,14 @@ import com.docus.server.record.service.ITBasicService;
import com.docus.server.sys.service.IPowerDeptService;
import com.docus.server.sys.service.IPowerUserService;
import com.xxl.job.core.context.XxlJobHelper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@Slf4j
public abstract class AbstractCollectJob<T> implements IJob<T> {
@Resource
protected IPowerUserService userService;
@ -37,14 +39,19 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
taskConfigService.updateAllPointerDate(taskConfigId, periodTime.getPeriodEndDate());
}
} catch (Exception ex) {
updateTaskState(ex, taskConfig);
log.error(ex.getMessage(), ex);
updateTaskState(ex.getMessage(), taskConfig);
}
if (StateEnum.FAIL.equals(taskConfig.getState())) {
updateTaskState(taskConfig);
}
}
@Override
public void startCollectIncrement(String taskConfigId) {
TaskConfig taskConfig = taskConfigService.getTaskConfig(taskConfigId);
TaskConfig taskConfig = getTaskConfig(taskConfigId);
try {
List<PeriodTime> periodTimes = taskConfig.getIncPeriodTimes();
@ -54,10 +61,16 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
});
} catch (Exception ex) {
updateTaskState(ex, taskConfig);
log.error(ex.getMessage(), ex);
updateTaskState(ex.getMessage(), taskConfig);
}
if (StateEnum.FAIL.equals(taskConfig.getState())) {
updateTaskState(taskConfig);
}
}
@Override
public void get(PeriodTime periodTime, TaskConfig taskConfig) {
//考虑到性能，应该把起始时间和结束时间进行切割拆分到每天。按段查询。
@ -78,15 +91,19 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
}
}
private void updateTaskState(Exception ex, TaskConfig taskConfig) {
private void updateTaskState(TaskConfig taskConfig) {
taskConfig.setState(StateEnum.OK);
taskConfigService.updateById(taskConfig);
}
private void updateTaskState(String message, TaskConfig taskConfig) {
taskConfig.setState(StateEnum.FAIL);
String message = ex.getMessage();
taskConfig.setErrorMsg(message.length() > 500 ? message.substring(0, 500) : message);
taskConfigService.updateByTaskId(taskConfig);
taskConfig.setLastErrorMsg(message.length() > 1000 ? message.substring(0, 1000) : message);
taskConfigService.updateById(taskConfig);
}
private TaskConfig getTaskConfig(String taskConfigId) {
return taskConfigService.getTaskConfig(taskConfigId);
return taskConfigService.getById(taskConfigId);
}
protected String getJobParam() {

5
common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java
Unescape Escape View File

@ -1,15 +1,14 @@
package com.docus.server.collect.web.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.docus.server.collect.web.domain.TaskConfig;
import java.util.Date;
public interface ITaskConfigService {
public interface ITaskConfigService extends IService<TaskConfig> {
void updateAllPointerDate(String id, Date date);
void updateIncPointerDate(String id, Date date);
TaskConfig getTaskConfig(String id);
void updateByTaskId(TaskConfig taskConfig);
}

12
common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java
Unescape Escape View File

@ -27,16 +27,4 @@ public class TaskConfigServiceImpl extends ServiceImpl<TaskConfigMapper, TaskCon
super.updateById(taskConfig);
}
@Override
public TaskConfig getTaskConfig(String id) {
return super.getById(id);
}
@Transactional
@Override
public void updateByTaskId(TaskConfig taskConfig) {
super.updateById(taskConfig);
}
}

4
docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java
Unescape Escape View File

@ -1,10 +1,12 @@
package com.docus.server.record.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.docus.server.record.pojo.dto.TBasicDTO;
import com.docus.server.record.pojo.entity.TBasic;
import java.util.List;
public interface ITBasicService {
public interface ITBasicService extends IService<TBasic> {
/**
* 新增

2
docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java
Unescape Escape View File

@ -40,7 +40,7 @@ public class UserDTO {
*/
private String authorId;
// ---------------------- base info ----------------------
// ---------------------- xml info ----------------------
/**
* id-消息流水号 返回消息体需要
*/

4
docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java
Unescape Escape View File

@ -1,10 +1,12 @@
package com.docus.server.sys.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.docus.server.sys.common.pojo.dto.DeptDTO;
import com.docus.server.sys.common.pojo.entity.PowerDept;
import java.util.List;
public interface IPowerDeptService {
public interface IPowerDeptService extends IService<PowerDept> {
/**
* 科室注册

4
docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java
Unescape Escape View File

@ -1,13 +1,15 @@
package com.docus.server.sys.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.docus.server.sys.common.pojo.dto.UserDTO;
import com.docus.server.sys.common.pojo.entity.PowerUser;
import java.util.List;
/**
* 用户服务
*/
public interface IPowerUserService {
public interface IPowerUserService extends IService<PowerUser> {
/**
* 用户注册
*

2
his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java → his-sysem/src/main/java/com/docus/server/his/service/impl/HisServiceImpl.java
Unescape Escape View File

@ -15,7 +15,7 @@ import java.util.List;
@Component
@AllArgsConstructor
public class HisService implements IHisService {
public class HisServiceImpl implements IHisService {
private final HisDeptMapper hisDeptMapper;
private final HisUserMapper hisUserMapper;

6
his-sysem/src/main/resources/mapper/HisDeptMapper.xml
Unescape Escape View File

@ -5,9 +5,9 @@
<mapper namespace="com.docus.server.his.infrastructure.mapper.HisDeptMapper">
<select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
WHERE update_time between #{startDate} and #{endDate}
order by update_time asc
SELECT `update_date` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
WHERE update_date between #{startDate} and #{endDate}
order by update_date asc
LIMIT #{offset}, #{pageSize}
</select>

Write Preview
Loading…
Cancel
Save