Merge remote-tracking branch 'origin/master'

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

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

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GBuildingBo.java

@@ -27,7 +27,7 @@ public class GBuildingBo extends BaseEntity {
      * 主键Id
      */
     @ApiModelProperty(value = "主键Id", required = true)
-    private Long Id;
+    private Long id;
     /**
      * 楼宇名
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java

@@ -193,7 +193,6 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
         result.getRecordsVo().forEach(item -> {
             if (StringUtils.isNotEmpty(item.getUserId()))
                 for (String uid : item.getUserId().split(",")) {
-                    System.out.println(uid);
                     GUserVo voById = gUserService.getVoById(uid);
                     if (ObjectUtils.isEmpty(voById))
                         continue;

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GBuildingServiceImpl.java

@@ -68,6 +68,7 @@ public class GBuildingServiceImpl extends ServicePlusImpl<GBuildingMapper, GBuil
         LambdaQueryWrapper<GBuilding> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), GBuilding::getName, bo.getName());
         lqw.eq(bo.getAreaId() != null, GBuilding::getAreaId, bo.getAreaId());
+        lqw.last(" ORDER BY CAST(NAME AS SIGNED) ASC");
         return lqw;
     }
 

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.getNumberOfRoutes()), GPressureRegulatingBox::getNumberOfRoutes, bo.getNumberOfRoutes());
         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.eq(StringUtils.isNotBlank(bo.getLongitude()), GPressureRegulatingBox::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), GPressureRegulatingBox::getLatitude, bo.getLatitude());

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) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<GRoadSectionInspection> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(GRoadSectionInspection::getCreateTime);
         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.getFindProblem()), GRoadSectionInspection::getFindProblem, bo.getFindProblem());

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java

@@ -63,6 +63,7 @@ public class GUserServiceImpl extends ServicePlusImpl<GUserMapper, GUser, GUserV
         LambdaQueryWrapper<GUser> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), GUser::getName, bo.getName());
         lqw.like(bo.getJobNum() != null, GUser::getJobNum, bo.getJobNum());
+        lqw.orderByDesc(GUser::getCreateTime);
         return lqw;
     }
 

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

ruoyi-gas/src/main/resources/mapper/GBuildingMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                name as name
         from g_building
         where area_id = #{areaId} and del_flag = '0'
+        order by create_time desc
     </select>
     <select id="getByName" resultType="com.ruoyi.gas.domain.GBuilding">
         select * from g_building

ruoyi-gas/src/main/resources/mapper/GUnitMapper.xml

@@ -52,6 +52,7 @@
                 and a.building_id = #{p.buildingId}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
 </mapper>

ruoyi-gas/src/main/resources/mapper/GUserMapper.xml

@@ -39,6 +39,7 @@
                 and a.ranks = #{p.ranks}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
     <select id="getWorker" resultType="com.ruoyi.gas.domain.vo.GUserForemanVo">