Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,7 @@ 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.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GCourtyardNetworkManagementBo;
 import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
 import com.ruoyi.gas.service.IGCourtyardNetworkManagementService;
@@ -42,6 +43,11 @@ public class GCourtyardNetworkManagementController extends BaseController {
 
     private final IGCourtyardNetworkManagementService iGCourtyardNetworkManagementService;
 
+    // 批量审核
+    @PostMapping("batchReview")
+    public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
+        return toAjax(iGCourtyardNetworkManagementService.batchReview(bo));
+    }
     /**
      * 查询庭院网管列表
      */

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

@@ -10,6 +10,7 @@ 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.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 import com.ruoyi.gas.service.IGRegulatorBoxService;
@@ -42,6 +43,11 @@ public class GRegulatorBoxController extends BaseController {
 
     private final IGRegulatorBoxService iGRegulatorBoxService;
 
+    // 批量审核
+    @PostMapping("batchReview")
+    public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
+        return toAjax(iGRegulatorBoxService.batchReview(bo));
+    }
     /**
      * 查询调压箱管理列表
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GRegulatingBoxMaintenanceController.java

@@ -1,31 +1,32 @@
 package com.ruoyi.gas.controller;
 
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
 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;
+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.vo.GRegulatingBoxMaintenanceVo;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
 import com.ruoyi.gas.service.IGRegulatingBoxMaintenanceService;
-import com.ruoyi.common.core.page.TableDataInfo;
 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.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 调压箱维护Controller
@@ -42,6 +43,12 @@ public class GRegulatingBoxMaintenanceController extends BaseController {
 
     private final IGRegulatingBoxMaintenanceService iGRegulatingBoxMaintenanceService;
 
+    // 批量审核
+    @PostMapping("batchReview")
+    public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
+        return toAjax(iGRegulatingBoxMaintenanceService.batchReview(bo));
+    }
+
     /**
      * 查询调压箱维护列表
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GValveWellPositionController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.gas.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -12,6 +13,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
 import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
+import com.ruoyi.gas.domain.vo.GWellPositionImportVo;
 import com.ruoyi.gas.service.IGValveWellPositionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,12 +22,12 @@ 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.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 阀井位置Controller
@@ -110,4 +112,61 @@ public class GValveWellPositionController extends BaseController {
                                        @PathVariable Long[] ids) {
         return toAjax(iGValveWellPositionService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
+
+    private String bfb="0";
+    private String message;
+
+    @GetMapping("/importTemplate")
+    @Log(title = "下载导入模板", businessType = BusinessType.EXPORT)
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "阀井位置", GWellPositionImportVo.class, response);
+    }
+
+    @Log(title = "导入小区列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/importData")
+    public synchronized AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
+        List<GWellPositionImportVo> listVo = ExcelUtil.importExcel(file.getInputStream(), GWellPositionImportVo.class);
+        List<GWellPositionImportVo> list = BeanUtil.copyToList(listVo, GWellPositionImportVo.class);
+        String operName = getUsername();
+        if(Double.valueOf(bfb)<=0){
+            forImportData(list,true,operName,0,0);
+        }
+        return  AjaxResult.success(message);
+    }
+
+    private void forImportData(List<GWellPositionImportVo> list, Boolean isUpdateSupport, String operName,int n,int successNum) throws Exception
+    {
+        try{
+            Map<String,Object> ret = iGValveWellPositionService.forImportData(list, isUpdateSupport, operName,n,successNum);//list, updateSupport, operName，第几条
+            if(Boolean.valueOf(ret.get("is_success").toString())){
+                bfb = ret.get("bfb").toString();
+                forImportData(list,isUpdateSupport,operName,Integer.valueOf(ret.get("n").toString()),Integer.valueOf(ret.get("successNum").toString()));
+            }else{
+                message = ret.get("successMsg").toString();
+            }
+        } catch (Exception e) {
+            message = e.getMessage();
+        }
+    }
+    /**
+     * 进度条刷新，
+     */
+    @GetMapping(value = "/flushProgress")
+    public AjaxResult<Map> flushProgress() throws Exception
+    {
+        Map<String,String> ret = new HashMap<>();
+        ret.put("bfb",bfb);
+        ret.put("message",message);
+        return AjaxResult.success(ret);
+    }
+    /**
+     * 结束进度条刷新，
+     */
+    @GetMapping(value = "/clearFlushProgress")
+    public AjaxResult<Void> clearFlushProgress() throws Exception
+    {
+        bfb="0";
+        message="";
+        return AjaxResult.success();
+    }
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.domain.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BatchReviewBo {
+
+    private List<Long> uids;
+    private String processStatus;
+    private String remarks;
+
+}

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

@@ -29,6 +29,9 @@ public class GEmergencyRepairBo extends BaseEntity {
     private List<String> time;
     private String processComments;
     private String houseHolds;
+    private String ydm;
+    private String hsm;
+    private List<String> datTime;
 
     /**
      * 主键id

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

@@ -0,0 +1,50 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 导入VO
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+// @Accessors(chain = true) // 导入不允许使用 会找不到set方法
+public class GWellPositionImportVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty(value = "阀井名称")
+    private String valveWellName;
+    @ExcelProperty(value = "位置")
+    private String position;
+    @ExcelProperty(value = "经度")
+    private String longitude;
+    @ExcelProperty(value = "纬度")
+    private String latitude;
+    @ExcelProperty(value = "控制区域")
+    private String remark;
+    @ExcelProperty(value = "行政区")
+    private String district;
+    @ExcelProperty(value = "队伍")
+    private String team;
+    @ExcelProperty(value = "阀头形状")
+    private String valveHeadShape;
+    @ExcelProperty(value = "阀井深度(米)")
+    private String valveWellDepth;
+    @ExcelProperty(value = "井盖代别")
+    private String manholeCoverInstead;
+    @ExcelProperty(value = "积水情况")
+    private String waterCondition;
+    @ExcelProperty(value = "压力等级")
+    private String pressureRating;
+    @ExcelProperty(value = "是否需要下井才能开关阀门")
+    private String isXyxjcnkg;
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.gas.service;
 
 import com.ruoyi.gas.domain.GCourtyardNetworkManagement;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
 import com.ruoyi.gas.domain.bo.GCourtyardNetworkManagementBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
@@ -16,6 +17,9 @@ import java.util.List;
  * @date 2023-10-26
  */
 public interface IGCourtyardNetworkManagementService extends IServicePlus<GCourtyardNetworkManagement, GCourtyardNetworkManagementVo> {
+
+	Boolean batchReview(BatchReviewBo bo);
+
 	/**
 	 * 查询单个
 	 * @return

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

@@ -1,6 +1,7 @@
 package com.ruoyi.gas.service;
 
 import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
@@ -16,6 +17,9 @@ import java.util.List;
  * @date 2024-05-09
  */
 public interface IGRegulatingBoxMaintenanceService extends IServicePlus<GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> {
+
+	Boolean batchReview(BatchReviewBo bo);
+
 	/**
 	 * 查询单个
 	 * @return

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

@@ -3,6 +3,7 @@ package com.ruoyi.gas.service;
 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.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.vo.GCensusVo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
@@ -17,6 +18,8 @@ import java.util.List;
  * @date 2023-10-24
  */
 public interface IGRegulatorBoxService extends IServicePlus<GRegulatorBox, GRegulatorBoxVo> {
+	Boolean batchReview(BatchReviewBo bo);
+
 	/**
 	 * 查询单个
 	 * @return

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

@@ -1,13 +1,15 @@
 package com.ruoyi.gas.service;
 
-import com.ruoyi.gas.domain.GValveWellPosition;
-import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
-import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.gas.domain.GValveWellPosition;
+import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
+import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
+import com.ruoyi.gas.domain.vo.GWellPositionImportVo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 阀井位置Service接口
@@ -16,6 +18,7 @@ import java.util.List;
  * @date 2024-03-18
  */
 public interface IGValveWellPositionService extends IServicePlus<GValveWellPosition, GValveWellPositionVo> {
+	Map<String,Object> forImportData(List<GWellPositionImportVo> list, Boolean isUpdateSupport, String operName, int n, int successNum);
 	/**
 	 * 查询单个
 	 * @return

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GCourtyardNetworkManagement;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GCourtyardNetworkManagementBo;
 import com.ruoyi.gas.domain.bo.GNetworkManagementPhotoBo;
 import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
@@ -18,6 +19,7 @@ import com.ruoyi.gas.service.IGNetworkManagementPhotoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +36,18 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
 
     @Autowired
     private IGNetworkManagementPhotoService igNetworkManagementPhotoService;
-
+    @Override
+    public Boolean batchReview(BatchReviewBo bo) {
+        Collection<GCourtyardNetworkManagement> boxList = new ArrayList<>();
+        bo.getUids().forEach(item -> {
+            GCourtyardNetworkManagement gCourtyardNetworkManagement = new GCourtyardNetworkManagement();
+            gCourtyardNetworkManagement.setId(item);
+            gCourtyardNetworkManagement.setProcessStatus(bo.getProcessStatus());
+            gCourtyardNetworkManagement.setRemarks(bo.getRemarks());
+            boxList.add(gCourtyardNetworkManagement);
+        });
+        return updateBatchById(boxList);
+    }
     @Override
     public GCourtyardNetworkManagementVo queryById(Long id){
         GCourtyardNetworkManagementVo byId = baseMapper.getById(id);

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

@@ -20,6 +20,7 @@ import com.ruoyi.gas.service.IGEmergencyRepairService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +49,15 @@ public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepai
     @Override
     public TableDataInfo<GEmergencyRepairVo> queryPageList(GEmergencyRepairBo bo) {
         Page<GEmergencyRepairVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        if (StringUtils.isNotEmpty(bo.getHsm())){
+            String time = bo.getYdm() + " " + bo.getHsm();
+            bo.setDatTime(Arrays.asList(time, time));
+        }
+        else if (StringUtils.isNotEmpty(bo.getYdm()) && StringUtils.isEmpty(bo.getHsm())){
+            String staTime = bo.getYdm() + " 00:00:00" ;
+            String endTime = bo.getYdm() + " 23:59:59" ;
+            bo.setDatTime(Arrays.asList(staTime, endTime));
+        }
         Page<GEmergencyRepairVo> list = baseMapper.getList(bo, page);
         list.getRecords().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenancePhotoBo;
 import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
@@ -20,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +34,19 @@ import java.util.stream.Collectors;
 public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegulatingBoxMaintenanceMapper, GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> implements IGRegulatingBoxMaintenanceService {
 
     @Override
+    public Boolean batchReview(BatchReviewBo bo) {
+        Collection<GRegulatingBoxMaintenance> gRegulatingBoxMaintenances = new ArrayList<>();
+        bo.getUids().forEach(item -> {
+            GRegulatingBoxMaintenance gRegulatingBoxMaintenance = new GRegulatingBoxMaintenance();
+            gRegulatingBoxMaintenance.setId(item);
+            gRegulatingBoxMaintenance.setProcessStatus(bo.getProcessStatus());
+            gRegulatingBoxMaintenance.setRemarks(bo.getRemarks());
+            gRegulatingBoxMaintenances.add(gRegulatingBoxMaintenance);
+        });
+        return updateBatchById(gRegulatingBoxMaintenances);
+    }
+
+    @Override
     public GRegulatingBoxMaintenanceVo queryById(Long id) {
 
         GRegulatingBoxMaintenanceVo voById = getVoById(id);

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GRegulatorBox;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxPhotoBo;
 import com.ruoyi.gas.domain.vo.GCensusVo;
@@ -19,6 +20,7 @@ import com.ruoyi.gas.service.IGRegulatorBoxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +38,18 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
 
     @Autowired
     private IGRegulatorBoxPhotoService igRegulatorBoxPhotoService;
-
+    @Override
+    public Boolean batchReview(BatchReviewBo bo) {
+        Collection<GRegulatorBox> boxList = new ArrayList<>();
+        bo.getUids().forEach(item -> {
+            GRegulatorBox box = new GRegulatorBox();
+            box.setId(item);
+            box.setProcessStatus(bo.getProcessStatus());
+            box.setRemarks(bo.getRemarks());
+            boxList.add(box);
+        });
+        return updateBatchById(boxList);
+    }
     @Override
     public GRegulatorBoxVo queryById(Long id) {
         GRegulatorBoxVo byId = baseMapper.getById(id);

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

@@ -1,23 +1,26 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GValveWellPosition;
 import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
 import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
-import com.ruoyi.gas.domain.GValveWellPosition;
+import com.ruoyi.gas.domain.vo.GWellPositionImportVo;
 import com.ruoyi.gas.mapper.GValveWellPositionMapper;
 import com.ruoyi.gas.service.IGValveWellPositionService;
+import com.ruoyi.system.mapper.SysDictDataMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import javax.annotation.Resource;
+import java.util.*;
 
 /**
  * 阀井位置Service业务层处理
@@ -27,9 +30,52 @@ import java.util.Collection;
  */
 @Service
 public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPositionMapper, GValveWellPosition, GValveWellPositionVo> implements IGValveWellPositionService {
+    @Resource
+    private SysDictDataMapper sysDictDataMapper;
+
+    @Override
+    public Map<String, Object> forImportData(List<GWellPositionImportVo> list, Boolean isUpdateSupport, String operName, int n, int successNum) {
+        if (ObjectUtils.isEmpty(list) || list.size() == 0) {
+            throw new ServiceException("导入数据不能为空！");
+        }
+        Map<String, Object> ret = new HashMap<>();
+        StringBuilder successMsg = new StringBuilder();
+        for (int i = n; i < list.size(); i++) {
+            GWellPositionImportVo vo = list.get(i);
+            String districtValue = sysDictDataMapper.queryValueTextByKey("district", vo.getDistrict());
+            if (StringUtils.isBlank(districtValue)) {
+                throw new ServiceException("第" + (n + 1) + "行行政区填写错误,导入失败!");
+            }
+            vo.setDistrict(districtValue);
+            try {
+                n++;
+                GValveWellPosition bean = BeanUtil.toBean(vo, GValveWellPosition.class);
+                boolean save = save(bean);
+                if (!save) {
+                    throw new ServiceException( "第" + (n + 1) + "行格式错误,导入失败!");
+                }
+                successNum++;
+                ret.put("bfb", String.format("%.2f", (Double.valueOf((n + 1)) / Double.valueOf(list.size())) * 100));
+                ret.put("n", n);
+                ret.put("is_success", true);
+                ret.put("successMsg", "");
+                ret.put("successNum", successNum);
+                return ret;
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+            }
+        }
+        successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
+        ret.put("bfb", String.format("%.2f", (Double.valueOf((n + 1)) / Double.valueOf(list.size())) * 100));
+        ret.put("n", n);
+        ret.put("is_success", false);
+        ret.put("successMsg", successMsg.toString());
+        return ret;
+    }
 
     @Override
-    public GValveWellPositionVo queryById(Long id){
+    public GValveWellPositionVo queryById(Long id) {
         return getVoById(id);
     }
 
@@ -77,13 +123,13 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(GValveWellPosition entity){
+    private void validEntityBeforeSave(GValveWellPosition 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/GEmergencyRepairMapper.xml

@@ -63,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.time != null  and p.time != ''">
                 and a.repair_time between #{p.time[0]} and #{p.time[1]}
             </if>
+            <if test="p.datTime != null  and p.datTime != ''">
+                and a.repair_time between #{p.datTime[0]} and #{p.datTime[1]}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>