wangyingyang

update skd and excel url

No preview for this file type
......@@ -74,7 +74,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void configurePathMatch(PathMatchConfigurer configurer) {
configurer.addPathPrefix("api", c -> c.getPackage().getName().contains("com.infoloop.tianting.controller"));
configurer.addPathPrefix("api", c -> c.getPackage().getName().contains("com.infoloop.tianting.controller") || c.getPackage().getName().contains("com.infoloop.tianting.streamController"));
}
@Bean
......
......@@ -15,6 +15,7 @@ import com.infoloop.tianting.service.KdsService;
import com.infoloop.tianting.service.client.EnterpriseResourceServiceRpcClient;
import com.infoloop.tianting.service.client.MenuServiceRpcClient;
import com.infoloop.tianting.service.client.OrderServiceRpcClient;
import com.infoloop.tianting.service.client.WOperatorServiceRpcClient;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
......@@ -31,8 +32,8 @@ import org.springframework.stereotype.Service;
public class KdsServiceImpl implements KdsService {
private final OrderServiceRpcClient orderServiceRpcClient;
private final MenuServiceRpcClient menuServiceRpcClient;
private final EnterpriseResourceServiceRpcClient enterpriseResourceServiceRpcClient;
private final WOperatorServiceRpcClient wOperatorServiceRpcClient;
@Override
public List<KdsOrderSkuDto> getOrderDetailBySku(KdsOrderSkuQueryDto queryDto) {
......@@ -44,16 +45,20 @@ public class KdsServiceImpl implements KdsService {
LocalDateTime tomorrowZero = tomorrow.atStartOfDay();
final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
boolean shouldFilterStallIds = false;
List<Integer> stallIds = new ArrayList<>();
final var operator = wOperatorServiceRpcClient.getWOperatorById(operatorLoginInfo.getId()).getResponse();
if (!operator.getIsSuper()) {
shouldFilterStallIds = true;
final var userResource = enterpriseResourceServiceRpcClient.getUserResources(
operatorLoginInfo.getEnterpriseId(), operatorLoginInfo.getId());
stallIds.addAll(userResource.getStallIdsList());
}
final var queryOrderDto = QueryOrderByConditionDto.builder()
.enterpriseId(operatorLoginInfo.getEnterpriseId())
.shouldFilterClientIds(true)
.clientIds(userResource.getClientIdsList())
.shouldFilterStallIds(true)
.stallIds(userResource.getStallIdsList())
.shouldFilterStallIds(shouldFilterStallIds)
.stallIds(stallIds)
.shouldFilterCreatedAtTimeStart(true)
.createdAtTimeStart(todayZero)
.shouldFilterCreatedAtTimeEnd(true)
......
......@@ -46,6 +46,9 @@ message HospitalDepartment {
string departmentCode = 2;
string departmentName = 3;
string departmentContent = 4;
string departmentAddress = 5;
string hospitalId = 6;
string hospitalCode = 7;
}
message GetCustomersByConditionRpcRequest {
......@@ -164,7 +167,7 @@ message HospitalAllergy {
enum MedicalAdviceTypeEnum {
UNKNOWN_MEDICAL_ADVICE_TYPE = 0;
MEAL = 1; //膳食医嘱
DIET = 1; //饮食医嘱
CLINICAL = 2; //临床文字医嘱
}
......