Commit fcc82b8f authored by 曹盼盼's avatar 曹盼盼

修改气瓶追溯

parent 185eccd6
...@@ -136,7 +136,7 @@ public class SafetyServiceImpl implements ISafetyService { ...@@ -136,7 +136,7 @@ public class SafetyServiceImpl implements ISafetyService {
RequestContext.setProduct(product); RequestContext.setProduct(product);
RequestContext.setAppKey(appKey); RequestContext.setAppKey(appKey);
try { try {
// mobileVerifyCodeResult = privilegeFeginService.mobileVerifyCode(model);
mobileVerifyCodeResult=Privilege.authClient.mobileVerifyCode(model); mobileVerifyCodeResult=Privilege.authClient.mobileVerifyCode(model);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -202,7 +202,7 @@ public class SafetyServiceImpl implements ISafetyService { ...@@ -202,7 +202,7 @@ public class SafetyServiceImpl implements ISafetyService {
RequestContext.setToken("token"); RequestContext.setToken("token");
RequestContext.setProduct(product); RequestContext.setProduct(product);
RequestContext.setAppKey(appKey); RequestContext.setAppKey(appKey);
mobileVerifyCodeResult = privilegeFeginService.mobileVerifyCode(model); mobileVerifyCodeResult=Privilege.authClient.mobileVerifyCode(model);
if (mobileVerifyCodeResult.getStatus() != platformSuccessCode) { if (mobileVerifyCodeResult.getStatus() != platformSuccessCode) {
if (log.isErrorEnabled()) { if (log.isErrorEnabled()) {
log.error("调用平台手机号验证码登录失败:{}", mobileVerifyCodeResult.getDevMessage()); log.error("调用平台手机号验证码登录失败:{}", mobileVerifyCodeResult.getDevMessage());
......
...@@ -71,7 +71,7 @@ public class SmallProServiceImpl implements SmallProService { ...@@ -71,7 +71,7 @@ public class SmallProServiceImpl implements SmallProService {
/** /**
* 公众号secret * 公众号secret
*/ */
@Value("${smallProgram.public.secret}")
private static final String publicSecret="8df0d4c5968d0d65cba2a398eedfd1e8"; private static final String publicSecret="8df0d4c5968d0d65cba2a398eedfd1e8";
/* @Autowired /* @Autowired
private IWechatSendMessageService wechatSendMessageService;*/ private IWechatSendMessageService wechatSendMessageService;*/
......
...@@ -205,11 +205,15 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind ...@@ -205,11 +205,15 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
public List<Map> getMaps(String o){ public List<Map> getMaps(String o){
List list=new ArrayList(); List list=new ArrayList();
JSONObject objects = JSONObject.parseObject(o); JSONArray jsonArray = JSONArray.parseArray(o);
for (Object li : jsonArray) {
JSONObject objects = JSONObject.parseObject(li.toString());
HashMap<String, String> map= new HashMap<>(); HashMap<String, String> map= new HashMap<>();
map.put("url",objects.getString("fileUrl")); map.put("url",objects.getString("fileUrl"));
map.put("name",objects.getString("fileName")); map.put("name",objects.getString("fileName"));
list.add(map); list.add(map);
}
return list; return list;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment