From abba1aff81da3cc9d74d75f64cbd48d25716aec3 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Mar 2021 19:19:10 +0800
Subject: [PATCH] 1、增加对于套餐中的剩余读片量、有效开始日期、结束日期的加密 2、增加扣费过程中对于剩余读片量的加密 3、为下载私有云数据库增加合同与明细的查询Feign接口 4、修改合作商数据库（影像版API）的合同与明细的查询bug
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 159 +++++++++++++++-------
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 8 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java | 64 ++++----
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java | 16 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 16 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 16 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 14 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java | 26 +++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 88 ++++++++++++
9 files changed, 323 insertions(+), 84 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
index ad4e281..3e98292 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
@@ -34,4 +34,30 @@
*/
@PostMapping(value = "/contract/getStatus")
ResultBody getStatus(@RequestBody ProductOrder productOrder);
+
+ /**
+ * 私有云套餐验证
+ * @param params 参数
+ * hospitalId 医院ID
+ * departmentId 科室ID
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ @PostMapping("/productorderdetail/verificateProductOrderDetail")
+ ResultBody verificateProductOrderDetail(@RequestBody Map<String,Object> params);
+
+ /**
+ * 根据Map的条件获取合同列表
+ * @param params
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ @PostMapping("/contract/findProductOrderListByMap")
+ ResultBody findProductOrderListByMap(@RequestBody Map<String, Object> params);
+
+ /**
+ * 根据Map的条件获取合同明细（套餐）列表
+ * @param params
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ @PostMapping("/productorderdetail/findProductOrderDetailListByMap")
+ ResultBody findProductOrderDetailListByMap(@RequestBody Map<String, Object> params);
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
index 7f1bfce..df86108 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
@@ -6,6 +6,7 @@
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.Map;
@Slf4j
@@ -23,6 +24,21 @@
public ResultBody getStatus(ProductOrder productOrder) {
return ResultBody.failed().msg("获取正式和试用的的FeignClient接口失败");
}
+
+ @Override
+ public ResultBody verificateProductOrderDetail(@RequestBody Map<String,Object> params){
+ return ResultBody.failed().msg("私有云套餐验证的FeignClient接口失败");
+ }
+
+ @Override
+ public ResultBody findProductOrderListByMap(@RequestBody Map<String, Object> params){
+ return ResultBody.failed().msg("获取合同列表的FeignClient接口失败");
+ }
+
+ @Override
+ public ResultBody findProductOrderDetailListByMap(@RequestBody Map<String, Object> params){
+ return ResultBody.failed().msg("获取合同明细（套餐）列表的FeignClient接口失败");
+ }
};
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
index 633d2fa..6a8f53d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
@@ -84,6 +84,10 @@
*/
@NotNull(message = "读片量不能为空")
private Integer ailightCount;
+ /**
+ * 读片量加密串
+ */
+ private String ailightCountEncryption;
/**
* 报告量
@@ -96,11 +100,21 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proBegintime;
/**
+ * 有效的开始时间加密串
+ */
+ private String proBegintimeEncryption;
+
+ /**
* 有效的结束时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proEndtime;
/**
+ * 有效的结束时间加密串
+ */
+ private String proEndtimeEncryption;
+
+ /**
* 状态，1启用，0停用
*/
private Boolean enabled;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
index 066ea2b..5c86d6e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
@@ -144,5 +144,13 @@
*/
int getUserdProduct(Long hospitalId,Long departmentId);
+ /**
+ * 私有云套餐验证
+ * @param hospitalId 医院ID
+ * @param departmentId 科室ID
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ ResultBody verificateProductOrderDetail(Long hospitalId, Long departmentId );
+
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
index 0602227..b288170 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
@@ -6,6 +6,7 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.common.utils.AesUtils;
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
@@ -266,7 +267,7 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public ResultBody consumptionAIFail(ConsumptionRequest consumptionRequest) {
+ public ResultBody consumptionAIFail(ConsumptionRequest consumptionRequest) {
//默认的业务返回码
int bcode = -1;
//记录类型
@@ -338,6 +339,13 @@
if (productOrderDetail != null) {
//退还金额
productOrderDetail.setAilightCount(productOrderDetail.getAilightCount() + consumptionRecord.getConsumptionCount());
+ // 对于读片量进行加密
+ try {
+ productOrderDetail.setAilightCountEncryption(AesUtils.encrypt(productOrderDetail.getAilightCount().toString()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
productOrderDetail.setUpdateTime(new Date());
//退费
boolean consumptionRe = productOrderDetailService.saveOrUpdate(productOrderDetail);
@@ -504,6 +512,12 @@
productOrderDetail.setAilightCount(productOrderDetail.getAilightCount() - consumptionRequest.getConsumptionCount());
}
}
+ // 对于读片量进行加密
+ try {
+ productOrderDetail.setAilightCountEncryption(AesUtils.encrypt(productOrderDetail.getAilightCount().toString()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
//3.1扣费！
boolean consumptionRe = productOrderDetailService.saveOrUpdate(productOrderDetail);
if (consumptionRe) {
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java
index 4b65b36..fb8f716 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java
@@ -9,13 +9,10 @@
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.EncryptUtils;
import com.kidgrow.oprationcenter.mapper.PartnerDockingInfoMapper;
-import com.kidgrow.oprationcenter.model.PartnerDockingInfo;
-import com.kidgrow.oprationcenter.model.PartnerInfo;
-import com.kidgrow.oprationcenter.model.ProductOrder;
-import com.kidgrow.oprationcenter.model.ProductOrderRecord;
+import com.kidgrow.oprationcenter.model.*;
import com.kidgrow.oprationcenter.service.IPartnerDockingInfoService;
import com.kidgrow.oprationcenter.service.IPartnerInfoService;
-import com.kidgrow.oprationcenter.service.IProductOrderRecordService;
+import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.usercenter.feign.SysDepartmentService;
import com.kidgrow.usercenter.feign.SysDoctorService;
@@ -71,7 +68,7 @@
IProductOrderService productOrderService;
@Autowired
- IProductOrderRecordService productOrderRecordService;
+ IProductOrderDetailService productOrderDetailService;
/**
* 列表
@@ -333,44 +330,44 @@
orderMap.put("order_id", productOrder.getId());
orderMap.put("enabled", 1);
orderMap.put("is_del", 0);
- List<ProductOrderRecord> productOrderRecordList = productOrderRecordService.listByMap(orderMap);
+ List<ProductOrderDetail> productOrderDetailList = productOrderDetailService.listByMap(orderMap);
- if ((productOrderRecordList != null) && (productOrderRecordList.size() > 0)) {
+ if ((productOrderDetailList != null) && (productOrderDetailList.size() > 0)) {
- for (i = 0; i < productOrderRecordList.size(); i++) {
- ProductOrderRecord productOrderRecord = productOrderRecordList.get(i);
- createTime = "'" + dateTimeFormat.format(productOrderRecord.getCreateTime()) + "'";
- updateTime = (productOrderRecord.getUpdateTime() == null) ? "NULL" : "'" + dateTimeFormat.format(productOrderRecord.getUpdateTime()) + "'";
+ for (int j = 0; j < productOrderDetailList.size(); j++) {
+ ProductOrderDetail productOrderDetail = productOrderDetailList.get(j);
+ createTime = "'" + dateTimeFormat.format(productOrderDetail.getCreateTime()) + "'";
+ updateTime = (productOrderDetail.getUpdateTime() == null) ? "NULL" : "'" + dateTimeFormat.format(productOrderDetail.getUpdateTime()) + "'";
serviceSQL += "INSERT INTO order_detail VALUES( " +
- productOrderRecord.getId() + ", " +
- productOrderRecord.getOrderId() + ", " +
- productOrderRecord.getProId() + ", " +
- productOrderRecord.getProType() + ", " +
- "'" + productOrderRecord.getProName() + "', " +
- productOrderRecord.getAilightCount() + ", " +
- productOrderRecord.getRecordCount() + ", " +
- "'" + dateFormat.format(productOrderRecord.getProBegintime()) + "', " +
- "'" + dateFormat.format(productOrderRecord.getProEndtime()) + "', " +
- productOrderRecord.getIsShare() + ", " +
+ productOrderDetail.getId() + ", " +
+ productOrderDetail.getOrderId() + ", " +
+ productOrderDetail.getProId() + ", " +
+ productOrderDetail.getProType() + ", " +
+ "'" + productOrderDetail.getProName() + "', " +
+ productOrderDetail.getAilightCount() + ", " +
+ productOrderDetail.getRecordCount() + ", " +
+ "'" + dateFormat.format(productOrderDetail.getProBegintime()) + "', " +
+ "'" + dateFormat.format(productOrderDetail.getProEndtime()) + "', " +
+ productOrderDetail.getIsShare() + ", " +
"0, 0, " +
// 服务验证字符串【合作商ID、医院ID、科室ID、产品ID、开始日期、结束日期、读片数量、报告数量、已使用读片数量、已使用报告数量】
"'" + EncryptUtils.encryptAES((partnerDockingInfo.getPartnerId().toString() + "|" +
partnerDockingInfo.getHospitalId().toString() + "|" +
partnerDockingInfo.getDepartmentId().toString() + "|" +
- productOrderRecord.getProId().toString() + "|" +
- dateFormat.format(productOrderRecord.getProBegintime()) + "|" +
- dateFormat.format(productOrderRecord.getProEndtime()) + "|" +
- productOrderRecord.getAilightCount().toString() + "|" +
- productOrderRecord.getRecordCount() + "|" +
+ productOrderDetail.getProId().toString() + "|" +
+ dateFormat.format(productOrderDetail.getProBegintime()) + "|" +
+ dateFormat.format(productOrderDetail.getProEndtime()) + "|" +
+ productOrderDetail.getAilightCount().toString() + "|" +
+ productOrderDetail.getRecordCount() + "|" +
"0|0"), SecurityConstants.AES_KEY) + "', " +
- productOrderRecord.getIsDel() + ", " +
- productOrderRecord.getEnabled() + ", " +
+ productOrderDetail.getIsDel() + ", " +
+ productOrderDetail.getEnabled() + ", " +
createTime + ", " +
- productOrderRecord.getCreateUserId() + ", " +
- "'" + productOrderRecord.getCreateUserName() + "', " +
+ productOrderDetail.getCreateUserId() + ", " +
+ "'" + productOrderDetail.getCreateUserName() + "', " +
updateTime + ", " +
- productOrderRecord.getUpdateUserId() + ", " +
- "'" + productOrderRecord.getUpdateUserName() + "' " +
+ productOrderDetail.getUpdateUserId() + ", " +
+ "'" + productOrderDetail.getUpdateUserName() + "' " +
");\n\r";
}
} else {
@@ -405,5 +402,4 @@
return dbSql;
}
- ;
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index 82410ab..029ff37 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -1,10 +1,12 @@
package com.kidgrow.oprationcenter.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.common.utils.AesUtils;
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.feign.DiagnosticService;
@@ -29,6 +31,7 @@
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -442,4 +445,89 @@
return ResultBody.failed("医院和科室数据有误！");
}
}
+
+ /**
+ * 私有云套餐验证
+ * @param hospitalId 医院ID
+ * @param departmentId 科室ID
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ public ResultBody verificateProductOrderDetail(Long hospitalId, Long departmentId ){
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ // 查询科室可用的合同列表【当前日期在合同开始、结束日期之间】
+ List<ProductOrder> productOrderList = iProductOrderService.list(
+ new QueryWrapper<ProductOrder>()
+ .eq("hospital_id",hospitalId)
+ .eq("department_id",departmentId)
+ //.le("contract_begin_time",dateFormat.format(DateTime.now()))
+ //.ge("contract_end_time",dateFormat.format(DateTime.now()))
+ .eq("enabled",1)
+ .eq("is_del",0)
+ );
+
+ if ((productOrderList != null) && (productOrderList.size() > 0)) {
+ for (int i = 0 ; i < productOrderList.size(); i++) {
+
+ ProductOrder productOrder = productOrderList.get(i);
+ // 查询合同可用的套餐【当前日期在套餐开始、结束日期之间，剩余读片量大于零】
+ List<ProductOrderDetail> productOrderDetailList = baseMapper.selectList(
+ new QueryWrapper<ProductOrderDetail>()
+ .eq("order_id",productOrder.getId())
+ //.le("pro_begintime",dateFormat.format(DateTime.now()))
+ //.ge("pro_endtime",dateFormat.format(DateTime.now()))
+ //.gt("order_ailight_count",0)
+ //.gt("order_ailight_count - ailight_count",0)
+ .eq("enabled",1)
+ .eq("is_del",0)
+
+ );
+ if ((productOrderDetailList != null) && (productOrderDetailList.size() > 0)) {
+ try {
+ for (int j = 0; j < productOrderDetailList.size(); j++) {
+ ProductOrderDetail productOrderDetail = productOrderDetailList.get(j);
+ if ((productOrderDetail.getAilightCountEncryption() == null) || (productOrderDetail.getAilightCountEncryption().isEmpty())) {
+ log.error("可用读片数量验证串为空");
+ return ResultBody.failed("可用读片数量验证串为空");
+ }
+ if ((productOrderDetail.getProBegintimeEncryption() == null) || (productOrderDetail.getProBegintimeEncryption().isEmpty())) {
+ log.error("套餐开始日期验证串为空");
+ return ResultBody.failed("套餐开始日期验证串为空");
+ }
+ if ((productOrderDetail.getProEndtimeEncryption() == null) || (productOrderDetail.getProEndtimeEncryption().isEmpty())) {
+ log.error("套餐结束日期验证串为空");
+ return ResultBody.failed("套餐结束日期验证串为空");
+ }
+
+ String ailightCount = AesUtils.desEncrypt(productOrderDetail.getAilightCountEncryption());
+ String proBeginTime = AesUtils.desEncrypt(productOrderDetail.getProBegintimeEncryption());
+ String proEndTime = AesUtils.desEncrypt(productOrderDetail.getProEndtimeEncryption());
+
+ if ((ailightCount.isEmpty()) || (!productOrderDetail.getAilightCount().toString().equals(ailightCount))) {
+ log.error("可用读片数量验证失败");
+ return ResultBody.failed("可用读片数量验证失败");
+ }
+ if ((proBeginTime.isEmpty()) || (!dateFormat.format(productOrderDetail.getProBegintime()).equals(proBeginTime))) {
+ log.error("套餐开始日期验证失败");
+ return ResultBody.failed("套餐开始日期验证失败");
+ }
+ if ((proEndTime.isEmpty()) || (!dateFormat.format(productOrderDetail.getProEndtime()).equals(proEndTime))) {
+ log.error("套餐结束日期验证失败");
+ return ResultBody.failed("套餐结束日期验证失败");
+ }
+
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultBody.failed(e.getMessage());
+ }
+
+ }
+ }
+// } else {
+// return ResultBody.failed("无有效的合同");
+ }
+ log.error("私有云套餐验证通过");
+ return ResultBody.ok().msg("私有云套餐验证通过");
+ }
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index b1996c0..cfe1f36 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -198,4 +198,20 @@
return productOrderService.getStatus(productOrder);
}
+ /**
+ * 根据Map的条件获取合同列表
+ * @param params
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ @ApiOperation(value = "根据Map的条件获取合同列表")
+ @PostMapping("/findProductOrderListByMap")
+ public ResultBody findProductOrderListByMap(@RequestBody Map<String, Object> params) {
+ List<ProductOrder> productOrderList = productOrderService.listByMap(params);
+ if ((productOrderList!=null) && (productOrderList.size() > 0)) {
+ return ResultBody.ok().data(productOrderList);
+ } else {
+ return ResultBody.failed();
+ }
+ }
+
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index e6311d1..8b4fce7 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -4,6 +4,7 @@
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.*;
+import com.kidgrow.common.utils.AesUtils;
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.oprationcenter.model.HospitalInfo;
import com.kidgrow.oprationcenter.model.ProductOrder;
@@ -31,6 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.*;
@@ -58,6 +60,7 @@
private IProductOrderService productOrderService;
@Autowired
private SysUserService sysUserServiceFeign;
+
/**
* 列表
*/
@@ -91,6 +94,7 @@
}
return productOrderDetailService.all(params);
}
+
/**
* 列表
*/
@@ -143,6 +147,7 @@
}
return productOrderDetailService.groupList(params);
}
+
/**
* 查询到期列表
*/
@@ -159,6 +164,7 @@
}
return productOrderDetailService.productEndList(params);
}
+
/**
* 获取医院套餐是否到期和到期时间
* data内 isend为true说明套餐到期
@@ -172,8 +178,8 @@
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@GetMapping("/UserProductDetailData")
- public ResultBody<UserProductData> serProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) {
- return productOrderDetailService.userProductDetailData(hospitalId, departmentId,diagnosticId);
+ public ResultBody<UserProductData> serProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId, @RequestParam String diagnosticId) {
+ return productOrderDetailService.userProductDetailData(hospitalId, departmentId, diagnosticId);
}
/**
@@ -187,7 +193,7 @@
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@PostMapping("/serviceperiod")
public ResultBody<UserProductData> servicePeriod(@RequestBody HospitalInfo hospitalInfo) {
- return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId());
+ return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(), hospitalInfo.getDiagnosticId());
}
/**
@@ -215,7 +221,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult, @LoginUser SysUser sysUser) {
+ public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult, @LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -227,6 +233,18 @@
if (organizations.size() > 0) {
productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size() - 1).getOrgCode());
}
+ // 对于读片量、产品有效的开始、结束日期进行加密
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ if ((productOrderDetail.getAilightCountEncryption() == null) || (productOrderDetail.getAilightCountEncryption().isEmpty())) {
+ try {
+ productOrderDetail.setAilightCountEncryption(AesUtils.encrypt(productOrderDetail.getAilightCount().toString()));
+ productOrderDetail.setProBegintimeEncryption(AesUtils.encrypt(dateFormat.format(productOrderDetail.getProBegintime())));
+ productOrderDetail.setProEndtimeEncryption(AesUtils.encrypt(dateFormat.format(productOrderDetail.getProEndtime())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail);
if (v) {
return ResultBody.ok().data(productOrderDetail).msg("保存成功");
@@ -242,7 +260,7 @@
@ApiOperation(value = "保存")
@PostMapping("/saveall")
@Transactional(rollbackFor = Exception.class)
- public ResultBody batchInsert(@Valid @RequestBody List<ProductOrderDetail> list,BindingResult bindingResult) {
+ public ResultBody batchInsert(@Valid @RequestBody List<ProductOrderDetail> list, BindingResult bindingResult) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -254,12 +272,12 @@
ProductOrder productOrder = productOrderService.getById(list.get(0).getOrderId());
if (productOrder != null) {
//是否管理人员
- boolean ismanager=false,
+ boolean ismanager = false,
//是否有待审核套餐
- isenabled=false;
+ isenabled = false;
//如果是超管,高管,销售部门管理 则不受次数限制
- ResultBody<LoginAppUser> loginAppUserTemp=sysUserServiceFeign.getLoginAppUser();
- LoginAppUser loginAppUser=loginAppUserTemp.getData();
+ ResultBody<LoginAppUser> loginAppUserTemp = sysUserServiceFeign.getLoginAppUser();
+ LoginAppUser loginAppUser = loginAppUserTemp.getData();
if (loginAppUser != null) {
List<SysRole> sysRoleList = loginAppUser.getRoles();
@@ -270,7 +288,7 @@
roleName.equals(CommonConstant.SALE_MANAGER_ROLE_CODE) ||
roleName.equals(CommonConstant.PC_ADMIN_ROLE_CODE) ||
roleName.equals(CommonConstant.OPRATIONMANAGER_ROLE_CODE)) {
- ismanager=true;
+ ismanager = true;
break;
}
}
@@ -280,13 +298,27 @@
int counts = productOrderDetailService.getEnabledCount(productOrder.getDepartmentId());
if (counts >= CommonConstant.MAX_FREE_COUNT) {
//超过了限定次数 将试用套餐改为禁用 待审核
- for (int i = 0; i <list.size() ; i++) {
- if (list.get(i).getProType()==0) {
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getProType() == 0) {
//试用套餐
list.get(i).setEnabled(false);
- isenabled=true;
+ isenabled = true;
}
}
+ }
+ }
+ // 对于读片量、产品有效的开始、结束日期进行加密
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ for (int i = 0; i < list.size(); i++) {
+ if ((list.get(i).getAilightCountEncryption() == null) || (list.get(i).getAilightCountEncryption().isEmpty())) {
+ try {
+ list.get(i).setAilightCountEncryption(AesUtils.encrypt(list.get(i).getAilightCount().toString()));
+ list.get(i).setProBegintimeEncryption(AesUtils.encrypt(dateFormat.format(list.get(i).getProBegintime())));
+ list.get(i).setProEndtimeEncryption(AesUtils.encrypt(dateFormat.format(list.get(i).getProEndtime())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
}
}
//写充值套餐给用户
@@ -320,9 +352,7 @@
if (v && r && p) {
if (isenabled) {
return ResultBody.ok().data(list.size()).msg("充值成功,但是试用套餐需要管理审核才可使用!");
- }
- else
- {
+ } else {
return ResultBody.ok().data(list.size()).msg("产品充值成功...");
}
} else {
@@ -396,71 +426,102 @@
/**
* 统计获取数据量
- * @param datatype
- * 0 试用审核量
- * 1 套餐总量
- * 2 未处理用户反馈
- * 3 未处理数据需求
+ *
+ * @param datatype 0 试用审核量
+ * 1 套餐总量
+ * 2 未处理用户反馈
+ * 3 未处理数据需求
* @return
*/
@ApiOperation(value = "统计获取数据量")
@GetMapping("/oprationChart")
public ResultBody oprationChart(int datatype) {
- int counts=productOrderDetailService.oprationChart(datatype);
- return ResultBody.ok().data(counts).msg("数据获取成功!") ;
+ int counts = productOrderDetailService.oprationChart(datatype);
+ return ResultBody.ok().data(counts).msg("数据获取成功!");
}
/**
* 按指定类型统计合同数量
- * @param params
- * datatype 1 按年
- * 2 按月
- * 3 按天
- * 4 按周
- * beginTime 查询时间段的开始时间
- * endTime 结束时间
+ *
+ * @param params datatype 1 按年
+ * 2 按月
+ * 3 按天
+ * 4 按周
+ * beginTime 查询时间段的开始时间
+ * endTime 结束时间
* @return
*/
@ApiOperation(value = "按指定类型统计合同数量")
@GetMapping("/productOrderChart")
- public ResultBody productOrderChart(@RequestParam Map<String, Object> params) {
- List<OrderChartVo> orderChartVo=productOrderDetailService.productOrderChart(params);
- return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
+ public ResultBody productOrderChart(@RequestParam Map<String, Object> params) {
+ List<OrderChartVo> orderChartVo = productOrderDetailService.productOrderChart(params);
+ return ResultBody.ok().data(orderChartVo).msg("数据获取成功!");
}
/**
* 统计产品的使用数量
- * @return ccount 是数量
- * units 是产品名称
+ *
+ * @return ccount 是数量
+ * units 是产品名称
*/
@ApiOperation(value = "统计产品的使用数量")
@GetMapping("/proCountChart")
public ResultBody proCountChart() {
- List<OrderChartVo> orderChartVo=productOrderDetailService.proCountChart();
- return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
+ List<OrderChartVo> orderChartVo = productOrderDetailService.proCountChart();
+ return ResultBody.ok().data(orderChartVo).msg("数据获取成功!");
}
/**
* 获取软件服务周期 和 读片总量
- *
*/
@ApiOperation(value = "获取软件服务周期")
@GetMapping("/getContractBeginEndTimeAndNum")
public ResultBody getContractBeginEndTimeAndNum(@RequestParam("departmentId") Long departmentId) {
- Map<String,Object> map = new HashMap<>();
- map.put("department_id",departmentId);
- map.put("enabled",true);
- map.put("is_del",false);
+ Map<String, Object> map = new HashMap<>();
+ map.put("department_id", departmentId);
+ map.put("enabled", true);
+ map.put("is_del", false);
List<ProductOrder> productOrders = productOrderService.listByMap(map);
map = new HashMap<>();
- if(productOrders!=null&&productOrders.size()>0){
- IntSummaryStatistics intSummaryStatistics = productOrders.stream().filter(a-> a.getContractNum()!=null&&a.getEnabled()).mapToInt((x) -> x.getContractNum()).summaryStatistics();
- Date minDate = productOrders.stream().filter(a->a.getEnabled()).map(e -> e.getContractBeginTime()).min((e1, e2) -> e1.compareTo(e2)).get();
- Date manDate = productOrders.stream().filter(a->a.getEnabled()).map(e -> e.getContractEndTime()).max((e1, e2) -> e1.compareTo(e2)).get();
+ if (productOrders != null && productOrders.size() > 0) {
+ IntSummaryStatistics intSummaryStatistics = productOrders.stream().filter(a -> a.getContractNum() != null && a.getEnabled()).mapToInt((x) -> x.getContractNum()).summaryStatistics();
+ Date minDate = productOrders.stream().filter(a -> a.getEnabled()).map(e -> e.getContractBeginTime()).min((e1, e2) -> e1.compareTo(e2)).get();
+ Date manDate = productOrders.stream().filter(a -> a.getEnabled()).map(e -> e.getContractEndTime()).max((e1, e2) -> e1.compareTo(e2)).get();
map.put("count", intSummaryStatistics.getSum());
- map.put("beginTime",DateUtils.formatDate(minDate,"yyyy-MM-dd HH:mm:ss"));
- map.put("endTime",DateUtils.formatDate(manDate,"yyyy-MM-dd HH:mm:ss"));
+ map.put("beginTime", DateUtils.formatDate(minDate, "yyyy-MM-dd HH:mm:ss"));
+ map.put("endTime", DateUtils.formatDate(manDate, "yyyy-MM-dd HH:mm:ss"));
}
- return ResultBody.ok().data(map);
+ return ResultBody.ok().data(map);
+ }
+
+ /**
+ * 私有云套餐验证
+ * @param params 参数
+ * hospitalId 医院ID
+ * departmentId 科室ID
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ @ApiOperation(value = "私有云套餐验证")
+ @PostMapping("/verificateProductOrderDetail")
+ public ResultBody verificateProductOrderDetail(@RequestBody Map<String,Object> params ){
+ Long hospitalId = Long.valueOf(params.get("hospitalId").toString());
+ Long departmentId = Long.valueOf(params.get("departmentId").toString());
+ return productOrderDetailService.verificateProductOrderDetail(hospitalId,departmentId);
+ }
+
+ /**
+ * 根据Map的条件获取合同明细（套餐）列表
+ * @param params
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ @ApiOperation(value = "根据Map的条件获取合同明细（套餐）列表")
+ @PostMapping("/findProductOrderDetailListByMap")
+ public ResultBody findProductOrderDetailListByMap(@RequestBody Map<String, Object> params) {
+ List<ProductOrderDetail> productOrderDetailList = productOrderDetailService.listByMap(params);
+ if ((productOrderDetailList!=null) && (productOrderDetailList.size() > 0)) {
+ return ResultBody.ok().data(productOrderDetailList);
+ } else {
+ return ResultBody.failed();
+ }
}
}
--
Gitblit v1.8.0