浏览代码

更换obs地址及列表时间倒序

wang_xy 1 年之前
父节点
当前提交
fa6fa5999f

+ 5 - 5
ruoyi-admin/src/main/resources/application-prod.yml

@@ -159,13 +159,13 @@ redisson:
     dnsMonitoringInterval: 5000
     dnsMonitoringInterval: 5000
 #huawei:
 #huawei:
 #  obs:
 #  obs:
-#    ak: X54NQCIWAVXPIR6QB4BK
-#    sk: x7J3k8VjIt5zY5SITeb5JYaXbeY5ZPwE3XTw3FI0
+#    ak: TEAGJ1GSLMIJVDIX914U
+#    sk: jKm4WzEoLaMKVpzQL7jxQaFqgh4rJubK02bLcB5H
 #    upload:
 #    upload:
-#      endPoint: obs.cn-north-4.myhuaweicloud.com
+#      endPoint: obs.cn-south-1.myhuaweicloud.com
 #    access:
 #    access:
-#      endPoint: https://szrqgz.obs.cn-north-4.myhuaweicloud.com
-#    bucketName: szrqgz
+#      endPoint: https://zdsz.obs.cn-south-1.myhuaweicloud.com
+#    bucketName: zdsz
 huawei:
 huawei:
   obs:
   obs:
     ak: TEAGJ1GSLMIJVDIX914U
     ak: TEAGJ1GSLMIJVDIX914U

+ 1 - 1
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPressureRegulatingBoxServiceImpl.java

@@ -160,7 +160,7 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
         lqw.eq(StringUtils.isNotBlank(bo.getType()), GPressureRegulatingBox::getType, bo.getType());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), GPressureRegulatingBox::getType, bo.getType());
         lqw.eq(StringUtils.isNotBlank(bo.getNumberOfRoutes()), GPressureRegulatingBox::getNumberOfRoutes, bo.getNumberOfRoutes());
         lqw.eq(StringUtils.isNotBlank(bo.getNumberOfRoutes()), GPressureRegulatingBox::getNumberOfRoutes, bo.getNumberOfRoutes());
         lqw.eq(StringUtils.isNotBlank(bo.getManagementOffice()), GPressureRegulatingBox::getManagementOffice, bo.getManagementOffice());
         lqw.eq(StringUtils.isNotBlank(bo.getManagementOffice()), GPressureRegulatingBox::getManagementOffice, bo.getManagementOffice());
-        lqw.eq(StringUtils.isNotBlank(bo.getNumber()), GPressureRegulatingBox::getNumber, bo.getNumber());
+        lqw.like(StringUtils.isNotBlank(bo.getNumber()), GPressureRegulatingBox::getNumber, bo.getNumber());
         lqw.like(StringUtils.isNotBlank(bo.getName()), GPressureRegulatingBox::getName, bo.getName());
         lqw.like(StringUtils.isNotBlank(bo.getName()), GPressureRegulatingBox::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), GPressureRegulatingBox::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), GPressureRegulatingBox::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), GPressureRegulatingBox::getLatitude, bo.getLatitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), GPressureRegulatingBox::getLatitude, bo.getLatitude());

+ 1 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -68,6 +68,7 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
     private LambdaQueryWrapper<GRoadSectionInspection> buildQueryWrapper(GRoadSectionInspectionBo bo) {
     private LambdaQueryWrapper<GRoadSectionInspection> buildQueryWrapper(GRoadSectionInspectionBo bo) {
         Map<String, Object> params = bo.getParams();
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<GRoadSectionInspection> lqw = Wrappers.lambdaQuery();
         LambdaQueryWrapper<GRoadSectionInspection> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(GRoadSectionInspection::getCreateTime);
         lqw.like(StringUtils.isNotBlank(bo.getSectionName()), GRoadSectionInspection::getSectionName, bo.getSectionName());
         lqw.like(StringUtils.isNotBlank(bo.getSectionName()), GRoadSectionInspection::getSectionName, bo.getSectionName());
         lqw.eq(StringUtils.isNotBlank(bo.getSamplingMeterCount()), GRoadSectionInspection::getSamplingMeterCount, bo.getSamplingMeterCount());
         lqw.eq(StringUtils.isNotBlank(bo.getSamplingMeterCount()), GRoadSectionInspection::getSamplingMeterCount, bo.getSamplingMeterCount());
         lqw.eq(StringUtils.isNotBlank(bo.getFindProblem()), GRoadSectionInspection::getFindProblem, bo.getFindProblem());
         lqw.eq(StringUtils.isNotBlank(bo.getFindProblem()), GRoadSectionInspection::getFindProblem, bo.getFindProblem());

+ 2 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellInspectionServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GRoadSectionInspection;
 import com.ruoyi.gas.domain.GValveWellInspection;
 import com.ruoyi.gas.domain.GValveWellInspection;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionPhotoBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionPhotoBo;
@@ -63,6 +64,7 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
     private LambdaQueryWrapper<GValveWellInspection> buildQueryWrapper(GValveWellInspectionBo bo) {
     private LambdaQueryWrapper<GValveWellInspection> buildQueryWrapper(GValveWellInspectionBo bo) {
         Map<String, Object> params = bo.getParams();
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<GValveWellInspection> lqw = Wrappers.lambdaQuery();
         LambdaQueryWrapper<GValveWellInspection> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(GValveWellInspection::getCreateTime);
         lqw.eq(bo.getPositionId() != null, GValveWellInspection::getPositionId, bo.getPositionId());
         lqw.eq(bo.getPositionId() != null, GValveWellInspection::getPositionId, bo.getPositionId());
         lqw.eq(bo.getValveWellName() != null, GValveWellInspection::getPositionId, bo.getValveWellName());
         lqw.eq(bo.getValveWellName() != null, GValveWellInspection::getPositionId, bo.getValveWellName());
         lqw.eq(StringUtils.isNotBlank(bo.getDiscoverProblems()), GValveWellInspection::getDiscoverProblems, bo.getDiscoverProblems());
         lqw.eq(StringUtils.isNotBlank(bo.getDiscoverProblems()), GValveWellInspection::getDiscoverProblems, bo.getDiscoverProblems());