Skip to content

A
Aidea
Commit ed3db729 authored by 谢希宇's avatar 谢希宇
Browse files
Options

Aidea product update by Strive Date 2020-10-14

parent d1cbc343
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 80 deletions
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheet.java
View file @ ed3db729
......@@ -11,84 +11,80 @@ import java.io.Serializable;
import java.util.Date;
/**
* 咨询单
*
* @author Licc
* @date: 2020-09-22 12:06
*/
* 咨询单
*
* @author Licc
* @date: 2020-09-22 12:06
*/
@Data
public class ConsultSheet extends UserSheet implements Serializable {
/* 主键id */
private Long id;
/* 咨询单编码 */
@ExportConfig(value = "咨询单编码", width = 100, showLevel = 1)
private Long id;
/* 咨询单编码 */
@ExportConfig(value = "咨询单编码", width = 100, showLevel = 1)
private String consultId;
/* 用药人name */
@ExportConfig(value = "用药人姓名", width = 100, showLevel = 1)
/* 用药人name */
@ExportConfig(value = "用药人姓名", width = 100, showLevel = 1)
private String userName;
/* 身份证号 */
/* 身份证号 */
private String numberId;
/* 出生年月 */
@JSONField(format="yyyy-MM-dd")
private Date benebitId;
/* 性别 */
@ExportConfig(value = "性别", width = 100, showLevel = 1)
/* 出生年月 */
@JSONField(format = "yyyy-MM-dd")
private Date benebitId;
/* 性别 */
@ExportConfig(value = "性别", width = 100, showLevel = 1)
private Long sex;
/* 手机号 */
@ExportConfig(value = "联系电话", width = 100, showLevel = 1)
/* 手机号 */
@ExportConfig(value = "联系电话", width = 100, showLevel = 1)
private Long iPhone;
/* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1)
/* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1)
private String pastRecords;
/* 处方单 */
/* 处方单 */
@ExportConfig(value = "处方单", width = 100, showLevel = 1)
private String Prescription;
/* 药师id */
/* 药师id */
private Long doctorId;
/* 客服id */
/* 客服id */
private Long customerId;
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
private String illness;
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
private String allergy;
/* 本次确认症状 */
/* 本次确认症状 */
private String symptom;
/*是否已在医院确诊*/
private Long diagnosis;
/* 所属的账号 */
private Long accountsId;
/* 删除标识 */
private boolean delFlag;
/* 状态 */
@ExportConfig(value = "是否审核", width = 100, showLevel = 1)
private String status;
/* 创建时间 */
private Date createTime;
/* 更新时间 */
private Date updateTime;
/* 备注 */
private String description;
/* 创建人 */
private Long createBy;
/* 更新人 */
private Long updateBy;
/*是否已在医院确诊*/
private Long diagnosis;
/* 所属的账号 */
private Long accountsId;
/* 删除标识 */
private boolean delFlag;
/* 状态 */
@ExportConfig(value = "是否审核", width = 100, showLevel = 1)
private String status;
/* 创建时间 */
private Date createTime;
/* 更新时间 */
private Date updateTime;
/* 备注 */
private String description;
/* 创建人 */
private Long createBy;
/* 更新人 */
private Long updateBy;
private String openId;
private Long drugsId;
private Long memberId;
private Long orderId;
public ConsultSheet() {
this.delFlag = false;
this.status = "0";
public ConsultSheet() {
this.delFlag = false;
this.status = "0";
}
}
\ No newline at end of file
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheetVO.java
View file @ ed3db729
......@@ -12,11 +12,11 @@ import java.util.Date;
*/
@Data
public class ConsultSheetVO {
/* 咨询单编码 */
@ExportConfig(value = "咨询单编码", width = 100, showLevel = 1)
private String consultId;
/* 用药人name */
@ExportConfig(value = "用药人姓名", width = 100, showLevel = 1)
private String userName;
......@@ -24,18 +24,19 @@ public class ConsultSheetVO {
/* 性别 */
@ExportConfig(value = "性别", width = 100, showLevel = 1)
private String sex;
/* 手机号 */
@ExportConfig(value = "联系电话", width = 100, showLevel = 1)
private Long phone;
/* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1)
private String pastRecords;
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
private String illness;
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
private String allergy;
......@@ -47,6 +48,7 @@ public class ConsultSheetVO {
/* 药师姓名*/
@ExportConfig(value = "药师姓名", width = 100, showLevel = 1)
private String pharmaName;
/* 客服姓名*/
@ExportConfig(value = "客服姓名", width = 100, showLevel = 1)
private String customerName;
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/ConsultSheetService.java
View file @ ed3db729
......@@ -19,5 +19,9 @@ public interface ConsultSheetService extends GenericService<ConsultSheet> {
List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize ,Long id);
/**
* 提交咨询单且轮询对应客服、医生进行处理
* @param consultSheet
*/
JSONObject pollingConsultSheet(ConsultSheet consultSheet);
}
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java
View file @ ed3db729
......@@ -46,4 +46,21 @@ return consultSheetMapper;
params.put("id",id);
return consultSheetMapper.fetchSearchByPage(params);
}
@Override
public JSONObject pollingConsultSheet(ConsultSheet consultSheet) {
JSONObject retObj = new JSONObject();
try {
retObj.put("errerNo", 0);
retObj.put("data", 0);
} catch (Exception e) {
e.printStackTrace();
retObj.put("errrNo", 1);
retObj.put("errorMsg", "提交咨询单" + e.getMessage());
}
return retObj;
}
}
\ No newline at end of file
cftech-common-web/src/main/resources/redis-config-test.properties
View file @ ed3db729
# REDIS (RedisProperties)
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=0
spring.redis.database=15
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=211.159.220.36
#spring.redis.host=127.0.0.1
......
cftech-common-web/src/main/resources/redis-config.properties
View file @ ed3db729
# REDIS (RedisProperties)
# Redis数据库索引（默认为0）
spring.redis.database=0
# Redis服务器地址
# Redis\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA0\uFFFD\uFFFD
spring.redis.database=15
# Redis\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B7
spring.redis.host=172.17.0.2
# Redis服务器连接端口
# Redis\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04F6\u02FF\uFFFD
spring.redis.port=6379
# Redis服务器连接密码（默认为空）
# Redis\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uB8E8\u012C\uFFFD\uFFFD\u03AA\uFFFD\u0563\uFFFD
spring.redis.password=W1yXo/+FlJFDyCmGhUWK0vs75T8N4+SZ
# 连接池最大连接数（使用负值表示没有限制）
# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\u00F8\uFFFD\u05B5\uFFFD\uFFFD\u02BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD
spring.redis.pool.max-active=8
# 连接池最大阻塞等待时间（使用负值表示没有限制）
# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0234\uFFFD\u02B1\uFFFD\u48E8\u02B9\uFFFD\u00F8\uFFFD\u05B5\uFFFD\uFFFD\u02BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD
spring.redis.pool.max-wait=-1
# 连接池中的最大空闲连接
# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
spring.redis.pool.max-idle=8
# 连接池中的最小空闲连接
# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
spring.redis.pool.min-idle=0
# 连接超时时间（毫秒）
# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\u02B1\u02B1\uFFFD\u48E8\uFFFD\uFFFD\uFFFD\uB8E9
spring.redis.timeout=0
\ No newline at end of file
cftech-common/src/main/java/com/cftech/core/redis/RedisCacheConfig.java
View file @ ed3db729
......@@ -62,13 +62,13 @@ public class RedisCacheConfig extends CachingConfigurerSupport{
return config;
}
@Bean
public JedisPool jedisPool(JedisPoolConfig jedisPoolConfig)
{
JedisPool jedisPool = new JedisPool(jedisPoolConfig, SystemConfig.r.getProperty("spring.redis.host"),port,
Protocol.DEFAULT_TIMEOUT, PASS);
return jedisPool;
}
@Bean
public JedisPool jedisPool(JedisPoolConfig jedisPoolConfig)
{
JedisPool jedisPool = new JedisPool(jedisPoolConfig, SystemConfig.r.getProperty("spring.redis.host"),port,
Protocol.DEFAULT_TIMEOUT, PASS);
return jedisPool;
}
@Bean
public JedisConnectionFactory redisConnectionFactory(JedisPoolConfig jedisPoolConfig) {
......@@ -76,7 +76,8 @@ public class RedisCacheConfig extends CachingConfigurerSupport{
JedisConnectionFactory factory = new JedisConnectionFactory();
//factory.setHostName("120.195.144.73");//汤沟正式
factory.setHostName(SystemConfig.r.getProperty("spring.redis.host"));
//factory.setHostName("115.159.84.126");//畅服
factory.setDatabase(Integer.parseInt(SystemConfig.r.getProperty("spring.redis.database")));
//factory.setHostName("115.159.84.126");//畅服
//factory.setHostName("127.0.0.1");
factory.setPort(port);
factory.setUsePool(true);
......
pom.xml
View file @ ed3db729
......@@ -79,6 +79,7 @@
<module>workshop-module-web</module>
<module>schaeffler-modules</module>
<module>aidea-modules</module>
</modules>
<properties>
......
sys-module/src/main/java/com/cftech/sys/filter/JwtSecurityFilter.java
View file @ ed3db729
......@@ -48,7 +48,13 @@ public class JwtSecurityFilter implements Filter {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain ) throws IOException, ServletException {
HttpServletRequest httpRequest = ( HttpServletRequest )request;
HttpServletResponse httpResponse = ( HttpServletResponse )response;
if(httpRequest.getRequestURI().endsWith("/mobile/auth"))
if (httpRequest.getRequestURI().contains("/mobile/auth")) {
chain.doFilter( request, response );
return;
}
if(httpRequest.getRequestURI().endsWith("/mobile/wxjs/oauth"))
{
chain.doFilter( request, response );
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment