ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整快递相关查询排序

This commit is contained in:
Bo 2021-08-16 18:05:59 +08:00
parent 75f780a021
commit 29157e8387
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html
View File

@ -84,6 +84,8 @@
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
detailUrl: prefix + "/detail/{id}", detailUrl: prefix + "/detail/{id}",
sortName: "lastresponsetime",
sortOrder: "desc",
modalName: "快递订阅推送信息", modalName: "快递订阅推送信息",
columns: [{ columns: [{
checkbox: true checkbox: true

2
box-bps/src/main/resources/templates/bps/subscribe/subscribe.html
View File

@ -90,6 +90,8 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
sortName: "subscribetime",
sortOrder: "desc",
modalName: "快递订阅", modalName: "快递订阅",
columns: [{ columns: [{
checkbox: true checkbox: true

11
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
View File

@ -292,13 +292,13 @@ public class HttpUtils
} }
log.info("recv - {}", result); log.info("recv - {}", result);
} catch (ConnectException e) { } catch (ConnectException e) {
log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e); log.error("调用HttpUtils.sendXmlPost ConnectException, url=" + url + ",param=" + param, e);
} catch (SocketTimeoutException e) { } catch (SocketTimeoutException e) {
log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e); log.error("调用HttpUtils.sendXmlPost SocketTimeoutException, url=" + url + ",param=" + param, e);
} catch (IOException e) { } catch (IOException e) {
log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e); log.error("调用HttpUtils.sendXmlPost IOException, url=" + url + ",param=" + param, e);
} catch (Exception e) { } catch (Exception e) {
log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e); log.error("调用HttpsUtil.sendXmlPost Exception, url=" + url + ",param=" + param, e);
} finally { } finally {
try { try {
if (out != null) { if (out != null) {
@ -334,7 +334,7 @@ public class HttpUtils
result=restTemplate.postForEntity(url,params,String.class); result=restTemplate.postForEntity(url,params,String.class);
statusCode=result.getStatusCode().value(); statusCode=result.getStatusCode().value();
}catch (RestClientException e){ }catch (RestClientException e){
System.out.println("POST Request uri: "+url+", params:"+params+" error:"+e.getMessage()); log.error("POST Request uri: "+url+", params:"+params+" error:"+e.getMessage());
} }
Map<String,String> map=new HashMap<>(); Map<String,String> map=new HashMap<>();
map.put("statusCode",String.valueOf(statusCode)); map.put("statusCode",String.valueOf(statusCode));
@ -343,7 +343,6 @@ public class HttpUtils
} else{ } else{
map.put("result",String.valueOf(statusCode)); map.put("result",String.valueOf(statusCode));
} }
return map; return map;
} }
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -8,10 +8,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.common.core.domain.Ztree;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.http.HttpUtils;

7
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -9,12 +9,14 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.security.Md5Utils; import com.ruoyi.common.utils.security.Md5Utils;
import com.ruoyi.system.domain.*; import com.ruoyi.system.domain.EcologyUser;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.*; import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
@ -26,7 +28,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;