From ccd18863a48cf7e8fd1b1575f11846cb6a8eed3f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 27 Jan 2021 18:26:24 +0800 Subject: [PATCH] fix wiwide --- .../datatower/DataTowerController.java | 11 +++++++++++ .../db/migration/V202101260001__ocr.sql | 1 + .../com/iformall/ocr/FormallTess4jTrain.java | 3 ++- .../com/iformall/domain/po/WxWiWideInfo.java | 3 +++ .../com/iformall/service/DataTowerService.java | 2 ++ .../service/impl/DataTowerServiceImpl.java | 16 ++++++++++++++++ .../main/resources/mapper/WxWiwideInfoMapper.xml | 8 +++++++- 7 files changed, 42 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index a24b97ce8..5d353a771 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -80,6 +80,17 @@ public class DataTowerController extends BaseController { return new ResultData(data); } + + @ApiOperation("新版本查询客流") + @GetMapping("/queryCustomerNewVersion") + @SystemControllerLog(description = "数据塔台-新版本查询客流") + public ResultData queryCustomerNewVersion() { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryCustomerNewVersion"); + + Map data = dataTowerService.queryCustomer(getTenantInfo()); + + return new ResultData(data); + } @ApiOperation("查询客流") @GetMapping("/queryCustomerData") diff --git a/mallinkAdmin/src/main/resources/db/migration/V202101260001__ocr.sql b/mallinkAdmin/src/main/resources/db/migration/V202101260001__ocr.sql index d8fc5d50a..9223ca49e 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202101260001__ocr.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202101260001__ocr.sql @@ -38,3 +38,4 @@ CREATE TABLE `wx_mall_ocr_model` ( ALTER TABLE `wx_wiwide_info` ADD COLUMN `user_name` VARCHAR(100) COMMENT '登陆账号,首次初始化wiwideId和key用'; ALTER TABLE `wx_wiwide_info` ADD COLUMN `password` VARCHAR(100) COMMENT '登陆密码'; +ALTER TABLE `wx_wiwide_info` ADD COLUMN `old_plat` int(1) NOT NULL DEFAULT 0 COMMENT '是否是老平台 0-老平台 1-新平台'; diff --git a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java index 0f75998ec..db27abb96 100644 --- a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java +++ b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java @@ -89,7 +89,8 @@ public class FormallTess4jTrain { public static String getTrainSteps(String lang,String fontName) { - StringBuffer sb = new StringBuffer("请进入到样本图片文件夹用doc命令执行.").append(huanhangstr); + StringBuffer sb = new StringBuffer("请先安装tess4j(4.0以上),配置好环境变量. 下载jTessBoxEditor(用于训练,带FX的支持中文)").append(huanhangstr); + sb.append("请进入到样本图片文件夹用doc命令执行.").append(huanhangstr); sb.append("第一步,用jTessBoxEditor --> Tools --> Merge 多选图片,保存为tif格式 .命名格式为[lang].[fontName].exp0.tif. 命名:").append(lang).append(".").append(fontName).append(".exp0.tif ").append(huanhangstr); sb.append("............ ").append(huanhangstr); sb.append("第二步,用tif生成box ").append(huanhangstr); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java index 284971b3e..328ca4a01 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java @@ -37,5 +37,8 @@ public class WxWiWideInfo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="迈外迪信息类型列表,1,支持客流 2,支持wifi",name="capability") private String capability; + + @io.swagger.annotations.ApiModelProperty(value="是否是老平台 0-老平台 1-新平台",name="oldPlat") + private Integer oldPlat; } diff --git a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java index 0d2d8bbc2..5c5ee3144 100644 --- a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java +++ b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java @@ -16,6 +16,8 @@ public interface DataTowerService { Map queryCar(TenantEntity tenantEntity); Map queryCustomer(TenantEntity tenantEntity); + + Map queryCustomerNewVersion(TenantEntity tenantEntity); ResultData queryCustomerData(TenantEntity tenantEntity, Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 3d5cc82cb..777eff1b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -782,6 +782,22 @@ public class DataTowerServiceImpl implements DataTowerService { } return datamap; } + + @Override + public Map queryCustomerNewVersion(TenantEntity tenantEntity) { + WxWiWideInfo wiWideInfo = new WxWiWideInfo(); + wiWideInfo.updateTenantInfo(tenantEntity); + List list = wxWiwideInfoMapper.findList(wiWideInfo); + Map datamap = new HashMap<>(2); + if(list.size()>0){ + wiWideInfo = list.get(0); + String wiwideUrl = wiWideInfo.getWiwideUrl(); + datamap.put("token", getWiwideToken(wiWideInfo)); + datamap.put("url", wiwideUrl); + datamap.put("capability", wiWideInfo.getCapability()); + } + return datamap; + } private void updateToken(WxWiWideInfo wiWideInfo, String token) { Calendar instance = Calendar.getInstance(); diff --git a/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml index 763c3afd6..c769cd72e 100644 --- a/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml @@ -13,10 +13,11 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`wiwide_id`,`wiwide_key`,`wiwide_url`, `token`,`expired_time`,`capability`,`user_name`,`password` + `id`,`tenant_id`,`parent_tenant_id`,`wiwide_id`,`wiwide_key`,`wiwide_url`, `token`,`expired_time`,`capability`,`user_name`,`password`,`old_plat` @@ -36,6 +37,11 @@ and `wiwide_id` like concat('%', #{wiwideId},'%') + + + and `old_plat` = #{oldPlat} + + and id in