Commit 1dc65458f68fec888d918a2fe734d81f61818ebc
1 parent
b8d13eda
Exists in
dev
web管理后台气瓶地图响应数据慢问题修改
Showing
8 changed files
with
100 additions
and
50 deletions
Show diff stats
backend/lpg/src/main/java/com/hotent/lpg/controller/pt/PtQpxxConroller.java
| ... | ... | @@ -22,14 +22,14 @@ public class PtQpxxConroller { |
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | - * 根据id获取订单数据详情 | |
| 25 | + * 气瓶地图：查询所有气瓶并分为三种状态：1.属于本厂站并在本厂站的气瓶 2.属于本厂站在会员或其他厂站的气瓶 3.不属于本厂站在本厂站的气瓶 | |
| 26 | 26 | * |
| 27 | 27 | * @param qyId 企业ID，用于指定需要查询的企业 |
| 28 | 28 | * @param qzId 证件ID，用于指定需要查询的证件 |
| 29 | 29 | * @return 返回一个CommonResult对象，其中包含查询结果或错误信息 |
| 30 | 30 | */ |
| 31 | 31 | @GetMapping(value = "/qpMap") |
| 32 | - @ApiOperation(value = "根据id获取订单数据详情", httpMethod = "GET", notes = "根据id获取订单数据详情") | |
| 32 | + @ApiOperation(value = "气瓶地图", httpMethod = "GET", notes = "气瓶地图") | |
| 33 | 33 | public CommonResult<Object> qpMap(String qyId, String qzId) { |
| 34 | 34 | Object result = null; |
| 35 | 35 | try { | ... | ... |
backend/lpg/src/main/java/com/hotent/lpg/dao/WQpssxxDao.java
| ... | ... | @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| 5 | 5 | import com.hotent.lpg.common.model.WQpssxx; |
| 6 | 6 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| 7 | 7 | import com.hotent.lpg.common.model.WQpxx; |
| 8 | +import com.hotent.lpg.model.vo.QpdtVo; | |
| 8 | 9 | import org.apache.ibatis.annotations.Param; |
| 9 | 10 | |
| 11 | +import java.util.List; | |
| 12 | + | |
| 10 | 13 | /** |
| 11 | 14 | * 气瓶实时信息 Mapper 接口 |
| 12 | 15 | * |
| ... | ... | @@ -17,4 +20,6 @@ import org.apache.ibatis.annotations.Param; |
| 17 | 20 | public interface WQpssxxDao extends BaseMapper<WQpssxx> { |
| 18 | 21 | |
| 19 | 22 | IPage<WQpssxx> inHandQpPage(Page page, @Param("query") WQpxx wQpxx); |
| 23 | + | |
| 24 | + List<QpdtVo> getTypethree(String czId); | |
| 20 | 25 | } | ... | ... |
backend/lpg/src/main/java/com/hotent/lpg/manager/WQpssxxManager.java
| ... | ... | @@ -6,6 +6,9 @@ import com.hotent.lpg.common.model.WQpssxx; |
| 6 | 6 | import com.hotent.base.manager.BaseManager; |
| 7 | 7 | import com.hotent.lpg.common.model.WQpxx; |
| 8 | 8 | import com.hotent.lpg.model.dto.QpssxxDto; |
| 9 | +import com.hotent.lpg.model.vo.QpdtVo; | |
| 10 | + | |
| 11 | +import java.util.List; | |
| 9 | 12 | |
| 10 | 13 | /** |
| 11 | 14 | * 气瓶实时信息 服务类 |
| ... | ... | @@ -50,4 +53,6 @@ public interface WQpssxxManager extends BaseManager<WQpssxx> { |
| 50 | 53 | * @return |
| 51 | 54 | */ |
| 52 | 55 | IPage<WQpssxx> inHandQpPage(Page page, WQpxx wQpxx); |
| 56 | + | |
| 57 | + List<QpdtVo> getTypethree(String czId); | |
| 53 | 58 | } | ... | ... |
backend/lpg/src/main/java/com/hotent/lpg/manager/WQpxxManager.java
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpssxxManagerImpl.java
| ... | ... | @@ -17,6 +17,7 @@ import com.hotent.lpg.common.model.*; |
| 17 | 17 | import com.hotent.lpg.dao.WQpssxxDao; |
| 18 | 18 | import com.hotent.lpg.manager.*; |
| 19 | 19 | import com.hotent.lpg.model.dto.QpssxxDto; |
| 20 | +import com.hotent.lpg.model.vo.QpdtVo; | |
| 20 | 21 | import com.hotent.lpg.model.vo.QpxxVo; |
| 21 | 22 | import com.hotent.lpg.util.SynQpxxUtil; |
| 22 | 23 | import com.hotent.uc.util.ContextUtil; |
| ... | ... | @@ -183,6 +184,11 @@ public class WQpssxxManagerImpl extends BaseManagerImpl<WQpssxxDao, WQpssxx> imp |
| 183 | 184 | return baseMapper.inHandQpPage(page, wQpxx); |
| 184 | 185 | } |
| 185 | 186 | |
| 187 | + @Override | |
| 188 | + public List<QpdtVo> getTypethree(String czId) { | |
| 189 | + return baseMapper.getTypethree(czId); | |
| 190 | + } | |
| 191 | + | |
| 186 | 192 | /** |
| 187 | 193 | * 构造充装信息 |
| 188 | 194 | * | ... | ... |
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java
| ... | ... | @@ -529,10 +529,10 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement |
| 529 | 529 | map.put("qzmc", v.get(0).getFSsczmc()); |
| 530 | 530 | map.put("qzid", v.get(0).getFSsczid()); |
| 531 | 531 | //本厂站气瓶还在本厂站的气瓶 |
| 532 | - List<QpdtVo> typeone_collect = v.stream().filter(a -> a.getFSsczid().equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList()); | |
| 532 | + List<QpdtVo> typeone_collect = v.stream().filter(a -> k.equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList()); | |
| 533 | 533 | //本厂站气瓶不在本厂站的气瓶（在会员手中或者在其他厂站中） |
| 534 | - List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !a.getFSsczid().equals(a.getFCyczID())).collect(Collectors.toList()); | |
| 535 | - typetwoHandler(typetwo_collect); | |
| 534 | + List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList()); | |
| 535 | +// typetwoHandler(typetwo_collect); | |
| 536 | 536 | //其他厂站在本厂站的气瓶 |
| 537 | 537 | List<QpdtVo> typethree_collect = getTypethreeCollect(k); |
| 538 | 538 | map.put("typeone", typeone_collect); |
| ... | ... | @@ -1045,31 +1045,33 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement |
| 1045 | 1045 | * @return |
| 1046 | 1046 | */ |
| 1047 | 1047 | private List<QpdtVo> getTypethreeCollect(String k) { |
| 1048 | - List<WQpssxx> wQpssxxList = wQpssxxManager.list(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCyzlx, "厂站").eq(WQpssxx::getFCyczid, k)); | |
| 1049 | - List<QpdtVo> typethree_collect = new ArrayList<>(); | |
| 1050 | - for (WQpssxx wQpssxx : wQpssxxList) { | |
| 1051 | - WQpxx wQpxx = baseMapper.selectById(wQpssxx.getFQpid()); | |
| 1052 | - if (wQpxx == null || k.equals(wQpxx.getFSsczid())) { | |
| 1053 | - log.info("气瓶信息不存在或者气瓶属于本厂站，气瓶id={}，气瓶条码={}", wQpssxx.getFQpid(), wQpssxx.getFQptm()); | |
| 1054 | - continue; | |
| 1055 | - } | |
| 1056 | - QpdtVo qpdtVo = new QpdtVo(); | |
| 1057 | - qpdtVo.setId(wQpssxx.getFQpid()); | |
| 1058 | - qpdtVo.setFQptm(wQpssxx.getFQptm()); | |
| 1059 | - qpdtVo.setFQpgslx(wQpxx.getFQpgslx()); | |
| 1060 | - qpdtVo.setFSsqyID(wQpxx.getFSsqyid()); | |
| 1061 | - qpdtVo.setFSsczid(wQpxx.getFSsczid()); | |
| 1062 | - qpdtVo.setFSsqymc(wQpxx.getFSsqymc()); | |
| 1063 | - qpdtVo.setFSsczmc(wQpxx.getFSsczmc()); | |
| 1064 | - qpdtVo.setFCyzlx(wQpssxx.getFCyzlx()); | |
| 1065 | - qpdtVo.setFCyczID(wQpssxx.getFCyczid()); | |
| 1066 | - qpdtVo.setFCyyhID(wQpssxx.getFCyyhid()); | |
| 1067 | - qpdtVo.setFJd(wQpssxx.getFJd()); | |
| 1068 | - qpdtVo.setFWd(wQpssxx.getFWd()); | |
| 1069 | - qpdtVo.setFDz(wQpssxx.getFDqsf() + wQpssxx.getFDqs() + wQpssxx.getFDqq() + wQpssxx.getFDqjd() + wQpssxx.getFDqxxdz()); | |
| 1070 | - typethree_collect.add(qpdtVo); | |
| 1071 | - } | |
| 1072 | - return typethree_collect; | |
| 1048 | + List<QpdtVo> list = wQpssxxManager.getTypethree(k); | |
| 1049 | + return list; | |
| 1050 | +// List<WQpssxx> wQpssxxList = wQpssxxManager.list(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCyzlx, "厂站").eq(WQpssxx::getFCyczid, k)); | |
| 1051 | +// List<QpdtVo> typethree_collect = new ArrayList<>(); | |
| 1052 | +// for (WQpssxx wQpssxx : wQpssxxList) { | |
| 1053 | +// WQpxx wQpxx = baseMapper.selectById(wQpssxx.getFQpid()); | |
| 1054 | +// if (wQpxx == null || k.equals(wQpxx.getFSsczid())) { | |
| 1055 | +//// log.info("气瓶信息不存在或者气瓶属于本厂站，气瓶id={}，气瓶条码={}", wQpssxx.getFQpid(), wQpssxx.getFQptm()); | |
| 1056 | +// continue; | |
| 1057 | +// } | |
| 1058 | +// QpdtVo qpdtVo = new QpdtVo(); | |
| 1059 | +// qpdtVo.setId(wQpssxx.getFQpid()); | |
| 1060 | +// qpdtVo.setFQptm(wQpssxx.getFQptm()); | |
| 1061 | +// qpdtVo.setFQpgslx(wQpxx.getFQpgslx()); | |
| 1062 | +// qpdtVo.setFSsqyID(wQpxx.getFSsqyid()); | |
| 1063 | +// qpdtVo.setFSsczid(wQpxx.getFSsczid()); | |
| 1064 | +// qpdtVo.setFSsqymc(wQpxx.getFSsqymc()); | |
| 1065 | +// qpdtVo.setFSsczmc(wQpxx.getFSsczmc()); | |
| 1066 | +// qpdtVo.setFCyzlx(wQpssxx.getFCyzlx()); | |
| 1067 | +// qpdtVo.setFCyczID(wQpssxx.getFCyczid()); | |
| 1068 | +// qpdtVo.setFCyyhID(wQpssxx.getFCyyhid()); | |
| 1069 | +// qpdtVo.setFJd(wQpssxx.getFJd()); | |
| 1070 | +// qpdtVo.setFWd(wQpssxx.getFWd()); | |
| 1071 | +// qpdtVo.setFDz(wQpssxx.getFDqsf() + wQpssxx.getFDqs() + wQpssxx.getFDqq() + wQpssxx.getFDqjd() + wQpssxx.getFDqxxdz()); | |
| 1072 | +// typethree_collect.add(qpdtVo); | |
| 1073 | +// } | |
| 1074 | +// return typethree_collect; | |
| 1073 | 1075 | } |
| 1074 | 1076 | |
| 1075 | 1077 | /** | ... | ... |
backend/lpg/src/main/resources/mapper/WQpssxxMapper.xml
| ... | ... | @@ -191,4 +191,27 @@ |
| 191 | 191 | </if> |
| 192 | 192 | ) temp ORDER BY temp.orderType ASC |
| 193 | 193 | </select> |
| 194 | + | |
| 195 | + <select id="getTypethree" resultType="com.hotent.lpg.model.vo.QpdtVo"> | |
| 196 | + select | |
| 197 | + w_qpxx.id_ AS id, | |
| 198 | + w_qpxx.f_qptm AS fQptm, | |
| 199 | + w_qpxx.F_qpgslx AS fQpgslx, | |
| 200 | + w_qpxx.F_ssqyID AS fSsqyID, | |
| 201 | + w_qpxx.f_ssczid AS fSsczid, | |
| 202 | + w_qpxx.F_ssqymc AS fSsqymc, | |
| 203 | + w_qpxx.F_ssczmc AS fSsczmc, | |
| 204 | + w_qpssxx.F_cyzlx AS fCyzlx, | |
| 205 | + w_qpssxx.F_cyyhID AS fCyyhID, | |
| 206 | + w_qpssxx.F_cyczID AS fCyczID, | |
| 207 | + w_qpssxx.F_jd AS fJd, | |
| 208 | + w_qpssxx.F_wd AS fWd, | |
| 209 | + concat (F_dqsf,F_dqs,F_dqq,F_dqjd,F_dqxxdz) as fDz, | |
| 210 | + w_czxx.F_czmc as fXzczmc, | |
| 211 | + w_qpssxx.F_qplzID as fQplzId | |
| 212 | + from w_qpssxx w_qpssxx | |
| 213 | + inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_qpssxx.F_qpID | |
| 214 | + left join w_czxx w_czxx on w_czxx.ID_ = w_qpssxx.F_cyczID and w_qpssxx.F_cyzlx = '厂站' | |
| 215 | + where w_qpssxx.F_cyczID = #{czId} and w_qpssxx.F_cyczID != w_qpxx.F_ssczID | |
| 216 | + </select> | |
| 194 | 217 | </mapper> | ... | ... |
backend/lpg/src/main/resources/mapper/WQpxxMapper.xml
| ... | ... | @@ -148,30 +148,38 @@ |
| 148 | 148 | |
| 149 | 149 | <select id="qpMap" resultType="com.hotent.lpg.model.vo.QpdtVo"> |
| 150 | 150 | select |
| 151 | - wq.id_ AS id, | |
| 152 | - wq.f_qptm AS fQptm, | |
| 153 | - wq.F_qpgslx AS fQpgslx, | |
| 154 | - wq.F_ssqyID AS fSsqyID, | |
| 155 | - wq.f_ssczid AS fSsczid, | |
| 156 | - wq.F_ssqymc AS fSsqymc, | |
| 157 | - wq.F_ssczmc AS fSsczmc, | |
| 158 | - wq2.F_cyzlx AS fCyzlx, | |
| 159 | - wq2.F_cyyhID AS fCyyhID, | |
| 160 | - wq2.F_cyczID AS fCyczID, | |
| 161 | - wq2.F_jd AS fJd, | |
| 162 | - wq2.F_wd AS fWd, | |
| 151 | + w_qpxx.id_ AS id, | |
| 152 | + w_qpxx.f_qptm AS fQptm, | |
| 153 | + w_qpxx.F_qpgslx AS fQpgslx, | |
| 154 | + w_qpxx.F_ssqyID AS fSsqyID, | |
| 155 | + w_qpxx.f_ssczid AS fSsczid, | |
| 156 | + w_qpxx.F_ssqymc AS fSsqymc, | |
| 157 | + w_qpxx.F_ssczmc AS fSsczmc, | |
| 158 | + w_qpssxx.F_cyzlx AS fCyzlx, | |
| 159 | + w_qpssxx.F_cyyhID AS fCyyhID, | |
| 160 | + w_qpssxx.F_cyczID AS fCyczID, | |
| 161 | + w_qpssxx.F_jd AS fJd, | |
| 162 | + w_qpssxx.F_wd AS fWd, | |
| 163 | 163 | concat (F_dqsf,F_dqs,F_dqq,F_dqjd,F_dqxxdz) as fDz, |
| 164 | - wc.F_czmc as fXzczmc, | |
| 165 | - wq2.F_qplzID as fQplzId | |
| 166 | - from w_qpxx wq | |
| 167 | - inner join w_qpssxx wq2 on wq.ID_ = wq2.F_qpID | |
| 168 | - left join w_czxx wc on wc.ID_ = wq2.F_cyczID and wq2.F_cyzlx = '厂站' | |
| 164 | + w_czxx.F_czmc as fXzczmc, | |
| 165 | + w_qpssxx.F_qplzID as fQplzId, | |
| 166 | + w_dd.F_hymc as hymc, | |
| 167 | + w_dd.F_hydh as hydh, | |
| 168 | + w_dd.F_psrmc as psy, | |
| 169 | + w_dd.F_dddh as dddh, | |
| 170 | + w_dd.F_cjsj as xdsj | |
| 171 | + from w_qpxx w_qpxx | |
| 172 | + inner join w_qpssxx w_qpssxx on w_qpxx.ID_ = w_qpssxx.F_qpID | |
| 173 | + left join w_czxx w_czxx on w_czxx.ID_ = w_qpxx.F_ssczID | |
| 174 | + left join w_ddpsxq w_ddpsxq on w_ddpsxq.F_qplzID = w_qpssxx.F_qplzID | |
| 175 | + left join w_dd w_dd on w_dd.id_ = w_ddpsxq.F_ddID | |
| 176 | + | |
| 169 | 177 | <where> |
| 170 | 178 | <if test="qyId != null and qyId != ''"> |
| 171 | - and wq.F_ssqyID = #{qyId} | |
| 179 | + and w_qpxx.F_ssqyID = #{qyId} | |
| 172 | 180 | </if> |
| 173 | 181 | <if test="qzId != null and qzId != ''"> |
| 174 | - and wq.F_ssczID = #{qzId} | |
| 182 | + and w_qpxx.F_ssczID = #{qzId} | |
| 175 | 183 | </if> |
| 176 | 184 | </where> |
| 177 | 185 | </select> | ... | ... |