| @@ -80,6 +80,17 @@ public class DataTowerController extends BaseController { | |||||
| return new ResultData(data); | return new ResultData(data); | ||||
| } | } | ||||
| @ApiOperation("新版本查询客流") | |||||
| @GetMapping("/queryCustomerNewVersion") | |||||
| @SystemControllerLog(description = "数据塔台-新版本查询客流") | |||||
| public ResultData queryCustomerNewVersion() { | |||||
| logger.debug("[" + getIpAddr() + "] DataTowerController::queryCustomerNewVersion"); | |||||
| Map<String, Object> data = dataTowerService.queryCustomer(getTenantInfo()); | |||||
| return new ResultData(data); | |||||
| } | |||||
| @ApiOperation("查询客流") | @ApiOperation("查询客流") | ||||
| @GetMapping("/queryCustomerData") | @GetMapping("/queryCustomerData") | ||||
| @@ -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 `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 `password` VARCHAR(100) COMMENT '登陆密码'; | ||||
| ALTER TABLE `wx_wiwide_info` ADD COLUMN `old_plat` int(1) NOT NULL DEFAULT 0 COMMENT '是否是老平台 0-老平台 1-新平台'; | |||||
| @@ -89,7 +89,8 @@ public class FormallTess4jTrain { | |||||
| public static String getTrainSteps(String lang,String fontName) { | 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("第一步,用jTessBoxEditor --> Tools --> Merge 多选图片,保存为tif格式 .命名格式为[lang].[fontName].exp0.tif. 命名:").append(lang).append(".").append(fontName).append(".exp0.tif ").append(huanhangstr); | ||||
| sb.append("............ ").append(huanhangstr); | sb.append("............ ").append(huanhangstr); | ||||
| sb.append("第二步,用tif生成box ").append(huanhangstr); | sb.append("第二步,用tif生成box ").append(huanhangstr); | ||||
| @@ -37,5 +37,8 @@ public class WxWiWideInfo extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="迈外迪信息类型列表,1,支持客流 2,支持wifi",name="capability") | @io.swagger.annotations.ApiModelProperty(value="迈外迪信息类型列表,1,支持客流 2,支持wifi",name="capability") | ||||
| private String capability; | private String capability; | ||||
| @io.swagger.annotations.ApiModelProperty(value="是否是老平台 0-老平台 1-新平台",name="oldPlat") | |||||
| private Integer oldPlat; | |||||
| } | } | ||||
| @@ -16,6 +16,8 @@ public interface DataTowerService { | |||||
| Map<String,Object> queryCar(TenantEntity tenantEntity); | Map<String,Object> queryCar(TenantEntity tenantEntity); | ||||
| Map<String,Object> queryCustomer(TenantEntity tenantEntity); | Map<String,Object> queryCustomer(TenantEntity tenantEntity); | ||||
| Map<String,Object> queryCustomerNewVersion(TenantEntity tenantEntity); | |||||
| ResultData queryCustomerData(TenantEntity tenantEntity, Map<String, String> params); | ResultData queryCustomerData(TenantEntity tenantEntity, Map<String, String> params); | ||||
| @@ -782,6 +782,22 @@ public class DataTowerServiceImpl implements DataTowerService { | |||||
| } | } | ||||
| return datamap; | return datamap; | ||||
| } | } | ||||
| @Override | |||||
| public Map<String, Object> queryCustomerNewVersion(TenantEntity tenantEntity) { | |||||
| WxWiWideInfo wiWideInfo = new WxWiWideInfo(); | |||||
| wiWideInfo.updateTenantInfo(tenantEntity); | |||||
| List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(wiWideInfo); | |||||
| Map<String, Object> 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) { | private void updateToken(WxWiWideInfo wiWideInfo, String token) { | ||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||
| @@ -13,10 +13,11 @@ | |||||
| <result column="capability" jdbcType="VARCHAR" property="capability"/> | <result column="capability" jdbcType="VARCHAR" property="capability"/> | ||||
| <result column="user_name" jdbcType="VARCHAR" property="userName"/> | <result column="user_name" jdbcType="VARCHAR" property="userName"/> | ||||
| <result column="password" jdbcType="VARCHAR" property="password"/> | <result column="password" jdbcType="VARCHAR" property="password"/> | ||||
| <result column="old_plat" jdbcType="VARCHAR" property="oldPlat"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -36,6 +37,11 @@ | |||||
| <if test=" null != wiwideId "> | <if test=" null != wiwideId "> | ||||
| and `wiwide_id` like concat('%', #{wiwideId},'%') | and `wiwide_id` like concat('%', #{wiwideId},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != oldPlat "> | |||||
| and `old_plat` = #{oldPlat} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||