Merge remote-tracking branch 'origin/ht' into ht

webservice
calyrex 6 months ago
commit 18702e2787

@ -13,7 +13,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.weaver.verupgrade.general.BaseBean;
import com.weaver.verupgrade.general.Util;
import org.springframework.stereotype.Component;
@Component
public class GiftQtyService extends BaseBean {
private static final org.slf4j.Logger logger_a44d19bf = LoggerFactory.getLogger(GiftQtyService.class);
@ -21,12 +23,16 @@ public class GiftQtyService extends BaseBean {
private ConfigProp configProp;
public Map<String, String> call(ArrayOfGiftStockDt param) {
// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.lplysl_url")).trim();
logger_a44d19bf.info(String.valueOf("param" + param.toString()));
String url = configProp.getLplysl_url();
logger_a44d19bf.info(String.valueOf("configProp htk3oasync.lplysl_url" + url));
Map<String, String> map = new HashMap<String, String>();
try {
logger_a44d19bf.info(String.valueOf("GiftQtyService ------------ start "));
logger_a44d19bf.error("configProp == " + configProp.toString());
logger_a44d19bf.error("srmbacklisturl == " + configProp.getSrmbacklisturl());
logger_a44d19bf.error("lplysl_url == " + configProp.getLplysl_url());
String url = configProp.getLplysl_url();
logger_a44d19bf.info(String.valueOf("configProp htk3oasync.lplysl_url" + url));
logger_a44d19bf.info(String.valueOf("GiftQtyService--start"));
GiftQtyServiceStub stub = new GiftQtyServiceStub(url);
stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE);

@ -28,6 +28,9 @@ public class CheckGiftNumFromK3Action extends BaseBean implements Action, EsbSer
@Autowired
private RequestInfo requestInfoTemp;
@Autowired
private GiftQtyService service;
private static final Logger logger_33d4b5 = LoggerFactory.getLogger(CheckGiftNumFromK3Action.class);
public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@ -88,7 +91,7 @@ public class CheckGiftNumFromK3Action extends BaseBean implements Action, EsbSer
logger_33d4b5.info("arr --- " + arr.toString());
giftStockDt.setGiftStockDt(arr);
logger_33d4b5.info("giftStockDt --- " + giftStockDt.toString());
GiftQtyService service = new GiftQtyService();
// GiftQtyService service = new GiftQtyService();
logger_33d4b5.info("service --- " + service.toString());
Map<String, String> map = service.call(giftStockDt);
StringBuilder sb = new StringBuilder();

@ -5,14 +5,17 @@ import com.weaver.common.authority.annotation.WeaPermission;
import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.common.distribution.genid.IdGenerator;
import com.weaver.common.distribution.lock.DistributionLockInterface;
import com.weaver.common.i18n.tool.util.I18nContextUtil;
import com.weaver.custom.configcenter.htsysjcmtConfig;
import com.weaver.ecode.api.dto.FolderDto;
import com.weaver.ecode.api.rpc.EcodeService;
import com.weaver.framework.client.annotation.WeaverConfigCenter;
import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.framework.rpc.context.impl.TenantRpcContext;
import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.teams.security.context.UserContext;
import com.weaver.teams.security.user.User;
import com.weaver.verupgrade.conn.RecordSet;
import com.weaver.workflow.common.entity.list.api.publicapi.RequestListInfoPAEntity;
import com.weaver.workflow.list.api.rest.publicapi.WflRequestListRest;
import lombok.Data;
@ -30,12 +33,6 @@ import java.util.List;
import java.util.Map;
@Slf4j
@WeaverConfigCenter(sources = {
@WeaverConfigCenter.ConfigProperty(
dataId = "weaver-secondev-htsysjcmt.properties",
group = "DEFAULT_GROUP",
refresh = "true")
})
@RestController
@RequestMapping({"/papi/secondev/workflow/demo" })
//@WeaPermission
@ -71,7 +68,17 @@ public class ApiController {
logger.error("srmbacklisturl == " +1);
logger.error("ApiController info : basePackage " + basePackage);
Map<String ,String > map = new HashMap<>();
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
String sql = "select * from eteams.dbo.employee where id = 100001700000000003";
TenantRpcContext.setTargetTenantKey("t6kj9c07jr");
rs.setTenantKey("t6kj9c07jr");
rs.executeQuery(sql);
if(rs.next()){
map.put("username" , rs.getString("username"));
map.put("id" ,rs.getString("id"));
}
logger.error("map == " +map);
// logger.info("ApiController info : hello " );
// final User currentUser = UserContext.getCurrentUser();
// //final Tenant currentTenant = TenantContext.getCurrentTenant();
@ -86,7 +93,7 @@ public class ApiController {
// logger.error("ApiController info : tenantKey= " + tenantKey );
return WeaResult.success(key);
return WeaResult.success(map.toString());
}

Loading…
Cancel
Save