提交代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GAreaController.java

@@ -43,13 +43,15 @@ public class GAreaController extends BaseController {
 
     private final IGAreaService iGAreaService;
     private final ObsService obsService;
+
     /**
      * 小区下拉
+     *
      * @return
      */
     @GetMapping("/getArea")
     public AjaxResult getArea() {
-        return AjaxResult.success(iGAreaService.getArea(null));
+        return AjaxResult.success(iGAreaService.getArea(null, null));
     }
 
 
@@ -91,8 +93,7 @@ public class GAreaController extends BaseController {
     @ApiOperation("获取小区详细信息")
     @PreAuthorize("@ss.hasPermi('gas:area:query')")
     @GetMapping("/{id}")
-    public AjaxResult<GAreaVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+    public AjaxResult<GAreaVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
         return AjaxResult.success(iGAreaService.queryById(id));
     }
 
@@ -125,10 +126,9 @@ public class GAreaController extends BaseController {
      */
     @ApiOperation("删除小区")
     @PreAuthorize("@ss.hasPermi('gas:area:remove')")
-    @Log(title = "小区" , businessType = BusinessType.DELETE)
+    @Log(title = "小区", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
         return toAjax(iGAreaService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAreaController.java

@@ -48,8 +48,8 @@ public class MAreaController extends BaseController {
      * @return
      */
     @GetMapping("/getArea")
-    public AjaxResult getArea(String name) {
-        return AjaxResult.success(iGAreaService.getArea(name));
+    public AjaxResult getArea(String userId,String name) {
+        return AjaxResult.success(iGAreaService.getArea(userId,name));
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MRegulatorBoxController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.web.controller.mobile;
 
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -8,16 +7,15 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.vo.GCensusVo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 import com.ruoyi.gas.service.IGRegulatorBoxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -61,6 +59,11 @@ public class MRegulatorBoxController extends BaseController {
         ExcelUtil.exportExcel(list, "调压箱管理", GRegulatorBoxVo.class, response);
     }
 
+    @GetMapping("getAdministrativeOffice")
+    public AjaxResult<List<GCensusVo>> getAdministrativeOffice(String userId){
+        return AjaxResult.success(iGRegulatorBoxService.getAdministrativeOffice(userId));
+    }
+
     /**
      * 获取调压箱管理详细信息
      */

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

@@ -60,6 +60,9 @@ spring:
           url: jdbc:mysql://49.232.253.249:3306/sj_zdsz_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: Lanyuxinxi@88.com
+#          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+#          username: zdsz
+#          password: ZDSZ1a2b3c4d%...
 #          szrqwx123456
         # 从库数据源
         slave:

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

@@ -51,7 +51,7 @@ spring:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://121.37.40.217:13306/gas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
           username: zdsz
           password: ZDSZ1a2b3c4d%...
 
@@ -114,13 +114,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: 123.249.30.140
+    host: 127.0.0.1
     # 端口，默认为6379
-    port: 6379
+    port: 16379
     # 数据库索引
     database: 0
     # 密码
-    password: szrqwx123
+    password: ZDSZ1a2b3c4d%...
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -177,4 +177,4 @@ huawei:
     bucketName: zdsz
 
 # 临时文件路径
-filePath: /temporary/
+filePath: /zdsz/temporary/

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GCourtyardNetworkManagement.java

@@ -30,7 +30,7 @@ public class GCourtyardNetworkManagement extends BaseEntity {
     /**
      * 单元id
      */
-    private Long unitId;
+    private Long buildingId;
     /**
      * 发现问题
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GUser.java

@@ -1,14 +1,11 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 用户对象 g_user
@@ -37,6 +34,7 @@ public class GUser extends BaseEntity {
      * 工号
      */
     private String jobNum;
+    private String administrativeOffice;
     /**
      * 手机号
      */

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

@@ -1,14 +1,12 @@
 package com.ruoyi.gas.domain.bo;
 
 import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -38,7 +36,7 @@ public class GCourtyardNetworkManagementBo extends BaseEntity {
      * 单元id
      */
     @ApiModelProperty(value = "单元id", required = true)
-    private Long unitId;
+    private Long buildingId;
 
     /**
      * 发现问题

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

@@ -1,16 +1,15 @@
 package com.ruoyi.gas.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
-import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 用户业务对象 g_user
@@ -86,4 +85,5 @@ public class GUserBo extends BaseEntity {
      */
     @ApiModelProperty(value = "民用工程权限")
     private String civilPower;
+    private String administrativeOffice;
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GAreaVo.java

@@ -46,6 +46,7 @@ public class GAreaVo {
 	@ExcelProperty(value = "负责工长")
 	@ApiModelProperty("负责工长")
 	private String userId;
+	private String userName;
 
     /**
      * 是否释放

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GCourtyardNetworkManagementVo.java

@@ -26,9 +26,9 @@ public class GCourtyardNetworkManagementVo {
 
 	private Long areaId;
 	private String areaName;
-	private Long buildingId;
+//	private Long buildingId;
 	private String buildingName;
-	private String unitName;
+//	private String unitName;
 	private List<String> photoList;
 	private String processStatus;
 	private String processComments;
@@ -44,7 +44,7 @@ public class GCourtyardNetworkManagementVo {
      */
 	@ExcelProperty(value = "单元id")
 	@ApiModelProperty("单元id")
-	private Long unitId;
+	private Long buildingId;
 
     /**
      * 发现问题

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GUserVo.java

@@ -2,9 +2,6 @@ package com.ruoyi.gas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import com.ruoyi.system.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,6 +50,7 @@ public class GUserVo {
 	@ExcelProperty(value = "密码")
 	@ApiModelProperty("密码")
 	private String password;
+	private String administrativeOffice;
 
 	/**
 	 * 工程权限

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GWarningPileVo.java

@@ -36,6 +36,7 @@ public class GWarningPileVo {
 	@ExcelProperty(value = "巡查人员id")
 	@ApiModelProperty("巡查人员id")
 	private String userId;
+	private String userName;
 
     /**
      * 警示桩名称

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GAreaMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.gas.mapper;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.gas.domain.GArea;
 import com.ruoyi.gas.domain.vo.GAreaVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
  */
 public interface GAreaMapper extends BaseMapperPlus<GArea> {
     List<String> getPhoto(Long id);
+
     //小区下拉
-    List<GAreaVo> getArea(String name);
+    List<GAreaVo> getArea(@Param("userId") String userId, @Param("name") String name);
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatorBoxMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.gas.domain.GRegulatorBox;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.vo.GCensusVo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,6 +20,7 @@ public interface GRegulatorBoxMapper extends BaseMapperPlus<GRegulatorBox> {
     Page<GRegulatorBoxVo> getList(@Param("p") GRegulatorBoxBo bo, Page<?> page);
 
     List<String> getPhoto(Long id);
+    List<GCensusVo> getAdministrativeOffice(String id);
     GRegulatorBoxVo getById(Long id);
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGAreaService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IGAreaService extends IServicePlus<GArea, GAreaVo> {
 
-    List<GAreaVo> getArea(String name);
+    List<GAreaVo> getArea(String userId,String name);
     Boolean releaseIs(Long id);
 
     List<String> getPhoto(Long id);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxService.java

@@ -1,10 +1,11 @@
 package com.ruoyi.gas.service;
 
-import com.ruoyi.gas.domain.GRegulatorBox;
-import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
-import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.gas.domain.GRegulatorBox;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.vo.GCensusVo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -31,6 +32,7 @@ public interface IGRegulatorBoxService extends IServicePlus<GRegulatorBox, GRegu
 	 * 查询列表
 	 */
 	List<GRegulatorBoxVo> queryList(GRegulatorBoxBo bo);
+	List<GCensusVo> getAdministrativeOffice(String userId);
 
 	/**
 	 * 根据新增业务对象插入调压箱管理

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

@@ -13,6 +13,7 @@ import com.ruoyi.gas.domain.GArea;
 import com.ruoyi.gas.domain.bo.GAreaBo;
 import com.ruoyi.gas.domain.bo.GAreaPhotoBo;
 import com.ruoyi.gas.domain.vo.GAreaVo;
+import com.ruoyi.gas.domain.vo.GUserVo;
 import com.ruoyi.gas.mapper.GAreaMapper;
 import com.ruoyi.gas.service.IGAreaPhotoService;
 import com.ruoyi.gas.service.IGAreaService;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.io.File;
 import java.util.Collection;
@@ -42,8 +44,8 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
     private IGAreaPhotoService igAreaPhotoService;
 
     @Override
-    public List<GAreaVo> getArea(String name) {
-        return baseMapper.getArea(name);
+    public List<GAreaVo> getArea(String userId, String name) {
+        return baseMapper.getArea(userId, name);
     }
 
 
@@ -92,9 +94,21 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
         return voById;
     }
 
+    @Autowired
+    private GUserServiceImpl gUserService;
+
     @Override
     public TableDataInfo<GAreaVo> queryPageList(GAreaBo bo) {
         PagePlus<GArea, GAreaVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item -> {
+            for (String uid : item.getUserId().split(",")) {
+                System.out.println(uid);
+                GUserVo voById = gUserService.getVoById(uid);
+                if (ObjectUtils.isEmpty(voById))
+                    continue;
+                item.setUserName(StringUtils.isEmpty(item.getUserName()) ? voById.getName() : item.getUserName() + "," + voById.getName());
+            }
+        });
         return PageUtils.buildDataInfo(result);
     }
 
@@ -109,6 +123,7 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
         lqw.like(StringUtils.isNotBlank(bo.getName()), GArea::getName, bo.getName());
         lqw.like(StringUtils.isNotBlank(bo.getUserId()), GArea::getUserId, bo.getUserId());
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), GArea::getDistrict, bo.getDistrict());
+        lqw.orderByDesc(GArea::getCreateTime);
         return lqw;
     }
 

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

@@ -58,7 +58,7 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
     private LambdaQueryWrapper<GCourtyardNetworkManagement> buildQueryWrapper(GCourtyardNetworkManagementBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<GCourtyardNetworkManagement> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getUnitId() != null, GCourtyardNetworkManagement::getUnitId, bo.getUnitId());
+        lqw.eq(bo.getBuildingId() != null, GCourtyardNetworkManagement::getBuildingId, bo.getBuildingId());
         lqw.eq(StringUtils.isNotBlank(bo.getFindProblem()), GCourtyardNetworkManagement::getFindProblem, bo.getFindProblem());
         lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GCourtyardNetworkManagement::getRemarks, bo.getRemarks());
         return lqw;

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

@@ -19,6 +19,7 @@ import com.ruoyi.gas.service.IGUserService;
 import com.ruoyi.gas.service.IGWarningPileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Collection;
 import java.util.List;
@@ -52,8 +53,8 @@ public class GPatrolRecordServiceImpl extends ServicePlusImpl<GPatrolRecordMappe
         Page<GPatrolRecordVo> list = baseMapper.getList(bo, page);
         list.getRecords().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            item.setUserName(igUserService.getVoById(item.getUserId()).getName());
-            item.setWarningPileName(igWarningPileService.getVoById(item.getWarningPileId()).getName());
+            item.setUserName(ObjectUtils.isEmpty(igUserService.getVoById(item.getUserId())) ? "" : igUserService.getVoById(item.getUserId()).getName());
+            item.setWarningPileName(ObjectUtils.isEmpty(igWarningPileService.getVoById(item.getWarningPileId())) ? "" : igWarningPileService.getVoById(item.getWarningPileId()).getName());
         });
         return PageUtils.buildDataInfo(list);
     }

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GRegulatorBox;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxPhotoBo;
+import com.ruoyi.gas.domain.vo.GCensusVo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 import com.ruoyi.gas.mapper.GRegulatorBoxMapper;
 import com.ruoyi.gas.service.IGRegulatorBoxPhotoService;
@@ -56,6 +57,12 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
         return listVo(buildQueryWrapper(bo));
     }
 
+    @Override
+    public List<GCensusVo> getAdministrativeOffice(String userId) {
+        System.out.println(baseMapper.getAdministrativeOffice(userId));
+        return baseMapper.getAdministrativeOffice(userId);
+    }
+
     private LambdaQueryWrapper<GRegulatorBox> buildQueryWrapper(GRegulatorBoxBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<GRegulatorBox> lqw = Wrappers.lambdaQuery();

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

@@ -11,12 +11,14 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GWarningPile;
 import com.ruoyi.gas.domain.bo.GWarningPileBo;
 import com.ruoyi.gas.domain.bo.GWarningPilePhotoBo;
+import com.ruoyi.gas.domain.vo.GUserVo;
 import com.ruoyi.gas.domain.vo.GWarningPileVo;
 import com.ruoyi.gas.mapper.GWarningPileMapper;
 import com.ruoyi.gas.service.IGWarningPilePhotoService;
 import com.ruoyi.gas.service.IGWarningPileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Collection;
 import java.util.List;
@@ -41,7 +43,7 @@ public class GWarningPileServiceImpl extends ServicePlusImpl<GWarningPileMapper,
     }
 
     @Override
-    public GWarningPileVo queryById(Long id){
+    public GWarningPileVo queryById(Long id) {
         GWarningPileVo voById = getVoById(id);
         voById.setPhotoList(baseMapper.getPhoto(voById.getId()));
         return voById;
@@ -50,15 +52,29 @@ public class GWarningPileServiceImpl extends ServicePlusImpl<GWarningPileMapper,
     @Override
     public TableDataInfo<GWarningPileVo> queryPageList(GWarningPileBo bo) {
         PagePlus<GWarningPile, GWarningPileVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        result.getRecordsVo().forEach(item -> item.setPhotoList(baseMapper.getPhoto(item.getId())));
+        result.getRecordsVo().forEach(item -> {
+            for (String uid : item.getUserId().split(",")) {
+                System.out.println(uid);
+                GUserVo voById = gUserService.getVoById(uid);
+                if (ObjectUtils.isEmpty(voById))
+                    continue;
+                item.setUserName(StringUtils.isEmpty(item.getUserName()) ? voById.getName() : item.getUserName() + "," + voById.getName());
+            }
+            item.setPhotoList(baseMapper.getPhoto(item.getId()));
+        });
+
         return PageUtils.buildDataInfo(result);
     }
 
+    @Autowired
+    private GUserServiceImpl gUserService;
+
     @Override
     public List<GWarningPileVo> getList(GWarningPileBo bo) {
         LambdaQueryWrapper<GWarningPile> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getUserId()), GWarningPile::getUserId, bo.getUserId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), GWarningPile::getName, bo.getName());
+        //        lqw.orderByDesc(GWarningPile::getCreateTime);
         List<GWarningPileVo> gWarningPileVos = this.listVo(lqw);
         gWarningPileVos.forEach(item -> item.setPhotoList(baseMapper.getPhoto(item.getId())));
         return gWarningPileVos;
@@ -66,7 +82,8 @@ public class GWarningPileServiceImpl extends ServicePlusImpl<GWarningPileMapper,
 
     @Override
     public List<GWarningPileVo> queryList(GWarningPileBo bo) {
-        return listVo(buildQueryWrapper(bo));
+        List<GWarningPileVo> gWarningPileVos = listVo(buildQueryWrapper(bo));
+        return gWarningPileVos;
     }
 
     private LambdaQueryWrapper<GWarningPile> buildQueryWrapper(GWarningPileBo bo) {
@@ -74,6 +91,7 @@ public class GWarningPileServiceImpl extends ServicePlusImpl<GWarningPileMapper,
         LambdaQueryWrapper<GWarningPile> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getUserId()), GWarningPile::getUserId, bo.getUserId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), GWarningPile::getName, bo.getName());
+        lqw.orderByDesc(GWarningPile::getCreateTime);
         return lqw;
     }
 
@@ -134,13 +152,13 @@ public class GWarningPileServiceImpl extends ServicePlusImpl<GWarningPileMapper,
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(GWarningPile entity){
+    private void validEntityBeforeSave(GWarningPile entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return removeByIds(ids);

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

@@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="name != null  and name != ''">
             and name like '%' #{name} '%'
         </if>
+        <if test="userId != null and userId != ''">
+            and user_id like '%' #{userId} '%'
+        </if>
 
     </select>
 </mapper>

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

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.gas.domain.GCourtyardNetworkManagement" id="GCourtyardNetworkManagementResult">
         <result property="id" column="id"/>
-        <result property="unitId" column="unit_id"/>
+        <result property="buildingId" column="building_id"/>
         <result property="findProblem" column="find_problem"/>
         <result property="remarks" column="remarks"/>
         <result property="delFlag" column="del_flag"/>
@@ -27,12 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo">
         select a.*,
-        b.name AS unitName,
         c.name AS buildingName,
         d.name AS areaName
         from g_courtyard_network_management a
-        left join g_unit b on a.unit_id = b.id and b.del_flag = '0'
-        left join g_building c on b.building_id = c.id and c.del_flag = '0'
+        left join g_building c on a.building_id = c.id and c.del_flag = '0'
         left join g_area d on d.id = c.area_id and d.del_flag = '0'
         <where>
             a.del_flag = '0'
@@ -40,17 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.find_problem = #{p.findProblem}
             </if>
         </where>
+        ORDER BY a.create_time DESC
     </select>
     <select id="getById" resultType="com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo">
         select a.*,
-               b.name AS unitName,
                c.id AS buildingId,
                c.name AS buildingName,
                d.id AS areaId,
                d.name AS areaName
         from g_courtyard_network_management a
-                 left join g_unit b on a.unit_id = b.id and b.del_flag = '0'
-                 left join g_building c on b.building_id = c.id and c.del_flag = '0'
+                 left join g_building c on a.building_id = c.id and c.del_flag = '0'
                  left join g_area d on d.id = c.area_id and d.del_flag = '0'
         where a.id = #{id}
           and a.del_flag = '0'

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

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.pipeline_pressure = #{p.pipelinePressure}
             </if>
         </where>
+        ORDER BY a.create_time DESC
     </select>
     <select id="getById" resultType="com.ruoyi.gas.domain.vo.GEmergencyRepairVo">
         select a.*

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

@@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.create_time = #{p.createTime}
             </if>
         </where>
+        ORDER BY a.create_time DESC
+
     </select>
 
 </mapper>

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

@@ -74,6 +74,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.number = #{p.number}
             </if>
         </where>
+        ORDER BY a.create_time DESC
+    </select>
+
+    <select id="getAdministrativeOffice" resultType="com.ruoyi.gas.domain.vo.GCensusVo">
+        SELECT b.dict_value AS value, b.dict_label AS name
+        FROM g_user a
+        LEFT JOIN sys_dict_data b ON b.dict_type = 'administrative_office'
+        AND b.dict_value IN ( SELECT SUBSTRING_INDEX(SUBSTRING_INDEX((SELECT administrative_office FROM g_user WHERE id = #{id}),',',help_topic_id+1),',',-1) AS num
+        FROM mysql.help_topic
+        WHERE help_topic_id &lt; LENGTH((SELECT administrative_office FROM g_user WHERE id = #{id}))-LENGTH(REPLACE((SELECT
+        administrative_office FROM g_user WHERE id = #{id}),',',''))+1 )
+        WHERE
+            a.id = #{id}   AND !ISNULL(a.administrative_office) AND a.administrative_office != ''
     </select>
 
 </mapper>

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

@@ -16,6 +16,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="power" column="power"/>
         <result property="civilPower" column="civil_power"/>
+        <result property="administrativeOffice" column="administrative_office"/>
     </resultMap>
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GUserVo">
         select id as id,