本地代码提交

src/main/java/com/macro/mall/tiny/modules/business/controller/BLineController.java

@@ -1,65 +0,0 @@
-package com.macro.mall.tiny.modules.business.controller;
-
-
-import com.macro.mall.tiny.common.api.CommonResult;
-import com.macro.mall.tiny.modules.business.model.BFile;
-import com.macro.mall.tiny.modules.business.model.BLine;
-import com.macro.mall.tiny.modules.business.service.KrBLineService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.websocket.server.PathParam;
-import java.util.List;
-
-/**
- * <p>
- * 线路表 前端控制器
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-@RestController
-@Api(tags = "BLineController", description = "提供线路相关API")
-@RequestMapping("/line")
-public class BLineController {
-
-    @Autowired
-    private KrBLineService lineService;
-
-
-    @ApiOperation("按照ID获取线路")
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<BLine> getItem(@PathVariable Long id) {
-        BLine line = lineService.getById(id);
-        return CommonResult.success(line);
-    }
-
-    @ApiOperation("获取线路列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<List<BLine>> list() {
-        List<BLine> lineList = lineService.getLineList();
-        return CommonResult.success(lineList);
-    }
-
-    @ApiOperation("按照关键字查询线路列表")
-    @RequestMapping(value = "/findByKey", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<List<BLine>> findByKey(@RequestParam @PathParam(value = "key") String key) {
-        List<BLine> lineList = lineService.findByKey(key);
-        return CommonResult.success(lineList);
-    }
-
-    @ApiOperation("获取线路文件资料")
-    @RequestMapping(value = "/getFile/{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<List<BFile>> getFile(@PathVariable Long id) {
-        List<BFile> data = lineService.getFile(id);
-        return CommonResult.success(data);
-    }
-}
-

src/main/java/com/macro/mall/tiny/modules/business/controller/BLineUploadLogController.java

@@ -1,37 +0,0 @@
-package com.macro.mall.tiny.modules.business.controller;
-
-
-import com.macro.mall.tiny.common.api.CommonResult;
-import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
-import com.macro.mall.tiny.modules.business.service.BLineUploadLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.websocket.server.PathParam;
-import java.util.List;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author macro
- * @since 2021-03-28
- */
-@RestController
-@Api(tags = "BLineUploadLogController", description = "提供上传日志相关API")
-@RequestMapping("/lineUploadLog")
-public class BLineUploadLogController {
-    @Autowired
-    private BLineUploadLogService lineUploadLogService;
-
-    @ApiOperation("获取最近N条上传记录")
-    @RequestMapping(method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<List<KrBLineUploadLog>> getItem(@RequestParam @PathParam(value = "limit") Integer limit) {
-        return CommonResult.success(lineUploadLogService.findLastUpload(limit));
-    }
-}
-

src/main/java/com/macro/mall/tiny/modules/business/controller/BProvinceController.java

@@ -1,41 +0,0 @@
-package com.macro.mall.tiny.modules.business.controller;
-
-
-import com.macro.mall.tiny.common.api.CommonResult;
-import com.macro.mall.tiny.modules.business.model.BProvince;
-import com.macro.mall.tiny.modules.business.service.impl.KrBRegionProvinceServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 后台角色资源关系表 前端控制器
- * </p>
- *
- * @author macro
- * @since 2021-03-19
- */
-@RestController
-@Api(tags = "BProvinceController", description = "省份管理")
-@RequestMapping("/province")
-public class BProvinceController {
-
-    @Autowired
-    private KrBRegionProvinceServiceImpl provinceService;
-
-    @ApiOperation("获取省份列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<List<BProvince>> list() {
-        List<BProvince> provinceList = provinceService.getProvinceList();
-        return CommonResult.success(provinceList);
-    }
-}
-

src/main/java/com/macro/mall/tiny/modules/business/controller/BTowerController.java

@@ -1,49 +0,0 @@
-package com.macro.mall.tiny.modules.business.controller;
-
-
-import com.macro.mall.tiny.common.api.CommonResult;
-import com.macro.mall.tiny.modules.business.model.BFile;
-import com.macro.mall.tiny.modules.business.model.BTower;
-import com.macro.mall.tiny.modules.business.service.KrBTowerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 塔表 前端控制器
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-@RestController
-@RequestMapping("/tower")
-@Api(tags = "BTowerController", description = "提供电塔相关API")
-public class BTowerController {
-
-    @Autowired
-    KrBTowerService towerService;
-
-    @ApiOperation("获取电塔基本资料")
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<BTower> getItem(@PathVariable Long id) {
-        BTower tower = towerService.getById(id);
-        return CommonResult.success(tower);
-    }
-
-    @ApiOperation("获取电塔文件资料")
-    @RequestMapping(value = "/getFile/{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<Map<String, List<BFile>>> getFile(@PathVariable Long id) {
-        Map<String, List<BFile>> data = towerService.getFile(id);
-        return CommonResult.success(data);
-    }
-
-}
-

src/main/java/com/macro/mall/tiny/modules/business/controller/FileController.java

@@ -63,6 +63,13 @@ public class FileController {
         String name = fileUploadParam.getName();
         String lineName = fileUploadParam.getLineName();
         String provinceId = fileUploadParam.getProvince();
+        String cityId = fileUploadParam.getCity();
+        String robotName = fileUploadParam.getRobotName();
+        String voltage = fileUploadParam.getVoltage();
+        String lineStatus = fileUploadParam.getLineStatus();
+        Long serviceBegintimeTs = fileUploadParam.getServiceBegintimeTs();
+        String beginTower = fileUploadParam.getBeginTower();
+        String endTower = fileUploadParam.getEndTower();
         Long size = fileUploadParam.getSize();
         Integer chunks = fileUploadParam.getChunks();
         Integer chunk = fileUploadParam.getChunk();
@@ -70,7 +77,7 @@ public class FileController {
         String charset = fileUploadParam.getCharset();
 
         if (chunks != null && chunks != 0) {
-            fileService.uploadWithBlock(name, lineName, provinceId, size, chunks, chunk, file, charset);
+            fileService.uploadWithBlock(name, lineName, provinceId,cityId,robotName, voltage, lineStatus, serviceBegintimeTs, beginTower, endTower, size, chunks, chunk, file, charset);
         } else {
             fileService.upload(file);
         }

src/main/java/com/macro/mall/tiny/modules/business/controller/KrBLineController.java

@@ -1,21 +1,67 @@
 package com.macro.mall.tiny.modules.business.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.modules.business.model.BFile;
+import com.macro.mall.tiny.modules.business.model.KrBLine;
+import com.macro.mall.tiny.modules.business.service.KrBLineService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.websocket.server.PathParam;
+import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 线路表 前端控制器
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-24
  */
 @RestController
-@RequestMapping("/business/krBLine")
+@Api(tags = "KrBLineController", description = "提供线路相关API")
+@RequestMapping("/line")
 public class KrBLineController {
 
+    @Autowired
+    private KrBLineService krBLineService;
+
+
+    @ApiOperation("按照ID获取线路")
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<KrBLine> getItem(@PathVariable Long id) {
+        KrBLine line = krBLineService.getById(id);
+        return CommonResult.success(line);
+    }
+
+    @ApiOperation("获取线路列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<List<KrBLine>> list() {
+        List<KrBLine> lineList = krBLineService.getLineList();
+        return CommonResult.success(lineList);
+    }
+
+    @ApiOperation("按照关键字查询线路列表")
+    @RequestMapping(value = "/findByKey", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<List<KrBLine>> findByKey(@RequestParam @PathParam(value = "key") String key,
+                                                 @RequestParam @PathParam(value = "provinceId") String provinceId,
+                                                 @RequestParam @PathParam(value = "cityId") String cityId) {
+        List<KrBLine> lineList = krBLineService.findByKey(key, provinceId, cityId);
+        return CommonResult.success(lineList);
+    }
+
+    @ApiOperation("获取线路文件资料")
+    @RequestMapping(value = "/getFile/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<List<BFile>> getFile(@PathVariable Long id) {
+        List<BFile> data = krBLineService.getFile(id);
+        return CommonResult.success(data);
+    }
 }
 

src/main/java/com/macro/mall/tiny/modules/business/controller/KrBLineUploadLogController.java

@@ -1,21 +1,37 @@
 package com.macro.mall.tiny.modules.business.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
+import com.macro.mall.tiny.modules.business.service.KrBLineUploadLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.websocket.server.PathParam;
+import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-28
  */
 @RestController
-@RequestMapping("/business/krBLineUploadLog")
+@Api(tags = "KrBLineUploadLogController", description = "提供上传日志相关API")
+@RequestMapping("/lineUploadLog")
 public class KrBLineUploadLogController {
+    @Autowired
+    private KrBLineUploadLogService krBLineUploadLogService;
 
+    @ApiOperation("获取最近N条上传记录")
+    @RequestMapping(method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<List<KrBLineUploadLog>> getItem(@RequestParam @PathParam(value = "limit") Integer limit) {
+        return CommonResult.success(krBLineUploadLogService.findLastUpload(limit));
+    }
 }
 

src/main/java/com/macro/mall/tiny/modules/business/controller/KrBRegionCityController.java

@@ -1,21 +1,41 @@
 package com.macro.mall.tiny.modules.business.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.modules.business.model.KrBRegionCity;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
+import com.macro.mall.tiny.modules.business.service.KrBRegionCityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.websocket.server.PathParam;
+import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author macro
  * @since 2021-09-07
  */
 @RestController
-@RequestMapping("/business/krBRegionCity")
+@Api(tags = "KrBRegionCityController", description = "城市管理")
+@RequestMapping("/city")
 public class KrBRegionCityController {
 
+    @Autowired
+    private KrBRegionCityService krBRegionCityService;
+
+    @ApiOperation("获取城市列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<List<KrBRegionCity>> list(@RequestParam @PathParam(value = "provinceId") String provinceId) {
+        List<KrBRegionCity> cityList = krBRegionCityService.getCityListByprovince(provinceId);
+        return CommonResult.success(cityList);
+    }
 }
 

src/main/java/com/macro/mall/tiny/modules/business/controller/KrBRegionCountyController.java

@@ -1,21 +0,0 @@
-package com.macro.mall.tiny.modules.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author macro
- * @since 2021-09-07
- */
-@RestController
-@RequestMapping("/business/krBRegionCounty")
-public class KrBRegionCountyController {
-
-}
-

src/main/java/com/macro/mall/tiny/modules/business/controller/KrBRegionProvinceController.java

@@ -1,23 +1,41 @@
 package com.macro.mall.tiny.modules.business.controller;
 
 
+import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.modules.business.model.KrBRegionProvince;
+import com.macro.mall.tiny.modules.business.service.KrBRegionProvinceService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
- *  前端控制器
+ * 后台角色资源关系表 前端控制器
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-19
  */
 @RestController
 @Api(tags = "KrBRegionProvinceController", description = "省份管理")
-@RequestMapping("/business/krBRegionProvince")
+@RequestMapping("/province")
 public class KrBRegionProvinceController {
 
+    @Autowired
+    private KrBRegionProvinceService krBRegionProvinceService;
+
+    @ApiOperation("获取省份列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<List<KrBRegionProvince>> list() {
+        List<KrBRegionProvince> provinceList = krBRegionProvinceService.getProvinceList();
+        return CommonResult.success(provinceList);
+    }
 }
 

src/main/java/com/macro/mall/tiny/modules/business/controller/KrBTowerController.java

@@ -1,21 +1,49 @@
 package com.macro.mall.tiny.modules.business.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.modules.business.model.BFile;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
+import com.macro.mall.tiny.modules.business.service.KrBTowerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 塔表 前端控制器
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-24
  */
 @RestController
-@RequestMapping("/business/krBTower")
+@RequestMapping("/tower")
+@Api(tags = "KrBTowerController", description = "提供电塔相关API")
 public class KrBTowerController {
 
+    @Autowired
+    KrBTowerService krBTowerService;
+
+    @ApiOperation("获取电塔基本资料")
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<KrBTower> getItem(@PathVariable Long id) {
+        KrBTower tower = krBTowerService.getById(id);
+        return CommonResult.success(tower);
+    }
+
+    @ApiOperation("获取电塔文件资料")
+    @RequestMapping(value = "/getFile/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<Map<String, List<BFile>>> getFile(@PathVariable Long id) {
+        Map<String, List<BFile>> data = krBTowerService.getFile(id);
+        return CommonResult.success(data);
+    }
+
 }
 

src/main/java/com/macro/mall/tiny/modules/business/dto/FileUploadParam.java

@@ -19,6 +19,27 @@ public class FileUploadParam {
     @ApiModelProperty(value = "上传压缩包所属省份ID")
     private String province;
 
+    @ApiModelProperty(value = "上传压缩包所属城市ID")
+    private String city;
+
+    @ApiModelProperty(value = "机器人名称")
+    private String robotName;
+
+    @ApiModelProperty(value = "电压等级，例：直流220kV，交流xkV")
+    private String voltage;
+
+    @ApiModelProperty(value = "线路状态：在运，停运")
+    private String lineStatus;
+
+    @ApiModelProperty(value = "投运时间")
+    private Long serviceBegintimeTs;
+
+    @ApiModelProperty(value = "机器运行的起始杆塔")
+    private String beginTower;
+
+    @ApiModelProperty(value = "机器运行的终止杆塔")
+    private String endTower;
+
     @ApiModelProperty(value = "上传文件名称")
     private String name;
 

src/main/java/com/macro/mall/tiny/modules/business/mapper/BLineUploadLogMapper.java

@@ -1,21 +0,0 @@
-package com.macro.mall.tiny.modules.business.mapper;
-
-import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author macro
- * @since 2021-03-28
- */
-public interface BLineUploadLogMapper extends BaseMapper<KrBLineUploadLog> {
-
-    List<KrBLineUploadLog> findLastUpload(@Param("limit") Integer limit);
-
-}

src/main/java/com/macro/mall/tiny/modules/business/mapper/KrBLineUploadLogMapper.java

@@ -2,6 +2,9 @@ package com.macro.mall.tiny.modules.business.mapper;
 
 import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -9,8 +12,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-28
  */
 public interface KrBLineUploadLogMapper extends BaseMapper<KrBLineUploadLog> {
 
+    List<KrBLineUploadLog> findLastUpload(@Param("limit") Integer limit);
+
 }

src/main/java/com/macro/mall/tiny/modules/business/mapper/KrBRegionCityMapper.java

@@ -1,7 +1,11 @@
 package com.macro.mall.tiny.modules.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.macro.mall.tiny.modules.business.model.KrBRegionCity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
+
+import java.util.List;
 
 /**
  * <p>

src/main/java/com/macro/mall/tiny/modules/business/model/KrBTower.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Objects;
 
@@ -47,10 +48,10 @@ public class KrBTower implements Serializable {
     private String hardwareType;
 
     @ApiModelProperty(value = "经度")
-    private Double longitude;
+    private BigDecimal longitude;
 
     @ApiModelProperty(value = "纬度")
-    private Double latitude;
+    private BigDecimal latitude;
 
     @ApiModelProperty(value = "杆塔性质（直线塔、耐张塔）")
     private String type;

src/main/java/com/macro/mall/tiny/modules/business/model/TowerExcelModel.java

@@ -2,25 +2,60 @@ package com.macro.mall.tiny.modules.business.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 public class TowerExcelModel extends BaseRowModel implements Serializable {
 
-    @ExcelProperty(value = "序号", index = 0)
-    private Integer sort;
+    @ExcelProperty(value = "杆塔序号（对应机器巡检方案号）", index = 0)
+    private Integer towerIndex;
 
-    @ExcelProperty(value = "杆塔号", index = 1)
-    private String name;
+    @ExcelProperty(value = "杆塔名称", index = 1)
+    private String towerName;
 
-    @ExcelProperty(value = "杆塔设备坐标", index = 2)
+    @ExcelProperty(value = "杆塔编号（SDG-18，SZT1-24等）", index = 2)
+    private String towerNumber;
+
+    @ExcelProperty(value = "金具串型号", index = 3)
+    private String hardwareType = "";
+
+    @ExcelProperty(value = "杆塔设备坐标", index = 4)
     private String lonLat;
 
-    @ExcelProperty(value = "型号", index = 3)
-    private String shape = "";
+    @ExcelProperty(value = "杆塔性质（直线塔、耐张塔）", index = 5)
+    private String type = "";
+
+    @ExcelProperty(value = "是否为太阳能基站塔", index = 6)
+    private String isStation = "否";
+
+    @ExcelProperty(value = "是否为微气象杆塔", index = 7)
+    private String isWeather = "否";
+
+    @ExcelProperty(value = "杆塔回路（单回/双回/四回/六回）", index = 8)
+    private String circuit = "";
+
+    @ExcelProperty(value = "杆塔高度，单位m", index = 9)
+    private Double height = 0d;
+
+    @ExcelProperty(value = "杆塔呼高，单位m", index = 10)
+    private Double practicalHeight = 0d;
+
+    @ExcelProperty(value = "转角方向（左/右/否）否为无转角", index = 11)
+    private String cornerDirection = "";
+
+    @ExcelProperty(value = "转角角度", index = 12)
+    private String cornerNumber = "";
+
+    @ExcelProperty(value = "档距", index = 13)
+    private Double span = 0d;
+
+    @ExcelProperty(value = "投运时间", index = 14)
+    private Date servuceBegintime;
 
-    @ExcelProperty(value = "金具串型号", index = 4)
-    private String hardware = "";
+    @ExcelProperty(value = "备注说明", index = 15)
+    private String remark = "";
 }

src/main/java/com/macro/mall/tiny/modules/business/service/BLineUploadLogService.java

@@ -1,19 +0,0 @@
-package com.macro.mall.tiny.modules.business.service;
-
-import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author macro
- * @since 2021-03-28
- */
-public interface BLineUploadLogService extends IService<KrBLineUploadLog> {
-
-    List<KrBLineUploadLog> findLastUpload(Integer limit);
-}

src/main/java/com/macro/mall/tiny/modules/business/service/FileService.java

@@ -17,7 +17,7 @@ public interface FileService {
 
     void upload(MultipartFile file) throws IOException;
 
-    void uploadWithBlock(String name, String lineName, String provinceId, Long size, Integer chunks, Integer chunk, MultipartFile file, String charset) throws IOException;
+    void uploadWithBlock(String name, String lineName, String provinceId, String cityId, String robotName, String voltage, String lineStatus, Long serviceBegintimeTs, String beginTower, String endTower, Long size, Integer chunks, Integer chunk, MultipartFile file, String charset) throws IOException;
 
     BDirectory getRootDirectory();
 

src/main/java/com/macro/mall/tiny/modules/business/service/KrBLineUploadLogService.java

@@ -3,14 +3,17 @@ package com.macro.mall.tiny.modules.business.service;
 import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-28
  */
 public interface KrBLineUploadLogService extends IService<KrBLineUploadLog> {
 
+    List<KrBLineUploadLog> findLastUpload(Integer limit);
 }

src/main/java/com/macro/mall/tiny/modules/business/service/KrBRegionCityService.java

@@ -3,6 +3,8 @@ package com.macro.mall.tiny.modules.business.service;
 import com.macro.mall.tiny.modules.business.model.KrBRegionCity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface KrBRegionCityService extends IService<KrBRegionCity> {
 
+    List<KrBRegionCity> getCityListByprovince(String provinceId);
+
 }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/AsyncHandler.java

@@ -48,10 +48,13 @@ public class AsyncHandler {
     private KrBRegionProvinceServiceImpl krBRegionProvinceService;
 
     @Autowired
+    private KrBRegionCityServiceImpl krBRegionCityService;
+
+    @Autowired
     private KrBLineService krBLineService;
 
     @Autowired
-    private BLineUploadLogService lineUploadLogService;
+    private KrBLineUploadLogService lineUploadLogService;
 
     @Autowired
     private KrBTowerService krBTowerService;
@@ -64,7 +67,7 @@ public class AsyncHandler {
 
     @Async
     @Transactional
-    public void handleDocument(String provinceId, String fileSource, String lineName, AdminUserDetails userDetails, String charset) {
+    public void handleDocument(String provinceId, String cityId, String fileSource, String lineName, String robotName, String voltage, String lineStatus, Long serviceBegintimeTs, String beginTower, String endTower, AdminUserDetails userDetails, String charset) {
         StringBuilder warnMsg = new StringBuilder();
         KrBLine line = null;
         Long userId = null;
@@ -87,9 +90,16 @@ public class AsyncHandler {
             if (line == null) {
                 // 如果为空，则创建新线路
                 KrBLine newLine = new KrBLine();
-                newLine.setCreatorId(userId);
-                newLine.setLineName(lineName);
                 newLine.setProvinceId(provinceId);
+                newLine.setCityId(cityId);
+                newLine.setLineName(lineName);
+                newLine.setRobotName(robotName);
+                newLine.setVoltage(voltage);
+                newLine.setLineStatus(lineStatus);
+                newLine.setServiceBegintime(new Date(serviceBegintimeTs));
+                newLine.setBeginTower(beginTower);
+                newLine.setEndTower(endTower);
+                newLine.setCreatorId(userId);
                 newLine.setCreateTime(new Date());
                 krBLineService.save(newLine);
                 line = newLine;
@@ -134,21 +144,31 @@ public class AsyncHandler {
                         booleanHashMap.put(SecDirectoryName, true);
                     } else if ("杆塔信息录入.xlsx".equals(SecDirectoryName) || "杆塔信息录入.xls".equals(SecDirectoryName)) {
                         List<TowerExcelModel> modelArrayList = EasyExcel.read(ais, TowerExcelModel.class, null).sheet().doReadSync();
-                        BLine finalLine = line;
+                        KrBLine finalLine = line;
                         towerList = modelArrayList.stream().map(model -> {
-                            BTower tower = new BTower();
-                            tower.setName(model.getName());
-                            tower.setShape(model.getShape());
-                            tower.setSort(model.getSort());
-                            tower.setHardwareType(model.getHardware());
+                            KrBTower tower = new KrBTower();
+                            tower.setLineId(finalLine.getId());
+                            tower.setTowerName(model.getTowerName());
+                            tower.setTowerNumber(model.getTowerNumber());
+                            tower.setHardwareType(model.getHardwareType());
                             // 经纬度设置
                             String lonLat = model.getLonLat();
                             String[] lonLats = lonLat.split(",");
                             BigDecimal lon = CommonUtils.Dms2D(lonLats[0]);
                             BigDecimal lat = CommonUtils.Dms2D(lonLats[1]);
-                            tower.setLon(lon);
-                            tower.setLat(lat);
-                            tower.setLineId(finalLine.getId());
+                            tower.setLongitude(lon);
+                            tower.setLatitude(lat);
+                            tower.setType(model.getType());
+                            tower.setIsStation("是".equals(model.getIsStation()) ? 1 : 0);
+                            tower.setIsWeather("是".equals(model.getIsWeather()) ? 1 : 0);
+                            tower.setCircuit(model.getCircuit());
+                            tower.setHeight(model.getHeight());
+                            tower.setPracticalHeight(model.getPracticalHeight());
+                            tower.setCornerDirection(model.getCornerDirection());
+                            tower.setCornerNumber(model.getCornerNumber());
+                            tower.setSpan(model.getSpan());
+                            tower.setServuceBegintime(model.getServuceBegintime());
+                            tower.setRemark(model.getRemark());
                             tower.setHasFile(0);
                             tower.setCreateTime(new Date());
                             return tower;
@@ -193,10 +213,10 @@ public class AsyncHandler {
             lineUploadLogService.save(lineUploadLog);
 
             // 后续更新塔是否包含资料
-            QueryWrapper<BTower> towerWrapper = new QueryWrapper<>();
-            towerWrapper.lambda().eq(BTower::getLineId, line.getId());
-            List<BTower> oriTowerList = krBTowerService.list(towerWrapper);
-            HashSet<BTower> towerSet = new HashSet<>(oriTowerList);
+            QueryWrapper<KrBTower> towerWrapper = new QueryWrapper<>();
+            towerWrapper.lambda().eq(KrBTower::getLineId, line.getId());
+            List<KrBTower> oriTowerList = krBTowerService.list(towerWrapper);
+            HashSet<KrBTower> towerSet = new HashSet<>(oriTowerList);
             towerSet.addAll(towerList);
             krBTowerService.setHasFile(new ArrayList<>(towerSet), userDetails);
 

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BLineUploadLogServiceImpl.java

@@ -1,33 +0,0 @@
-package com.macro.mall.tiny.modules.business.service.impl;
-
-import com.macro.mall.tiny.common.exception.Asserts;
-import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
-import com.macro.mall.tiny.modules.business.mapper.BLineUploadLogMapper;
-import com.macro.mall.tiny.modules.business.service.BLineUploadLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author macro
- * @since 2021-03-28
- */
-@Service
-public class BLineUploadLogServiceImpl extends ServiceImpl<BLineUploadLogMapper, KrBLineUploadLog> implements BLineUploadLogService {
-
-    @Autowired
-    private BLineUploadLogMapper lineUploadLogMapper;
-
-    @Override
-    public List<KrBLineUploadLog> findLastUpload(Integer limit) {
-        if (limit<1) Asserts.fail("请输入大于1的数");
-        return lineUploadLogMapper.findLastUpload(limit);
-    }
-
-}

src/main/java/com/macro/mall/tiny/modules/business/service/impl/FileServiceImpl.java

@@ -77,6 +77,13 @@ public class FileServiceImpl implements FileService {
     public void uploadWithBlock(String name,
                                 String lineName,
                                 String provinceId,
+                                String cityId,
+                                String robotName,
+                                String voltage,
+                                String lineStatus,
+                                Long serviceBegintimeTs,
+                                String beginTower,
+                                String endTower,
                                 Long size,
                                 Integer chunks,
                                 Integer chunk,
@@ -89,7 +96,7 @@ public class FileServiceImpl implements FileService {
         if (isUploaded(name)) {
             removeKey(name);
             AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-            asyncHandler.handleDocument(provinceId, target, lineName, userDetails, charset);
+            asyncHandler.handleDocument(provinceId, cityId, target, lineName,robotName,  voltage, lineStatus, serviceBegintimeTs,  beginTower,  endTower, userDetails, charset);
         }
     }
 

src/main/java/com/macro/mall/tiny/modules/business/service/impl/KrBLineUploadLogServiceImpl.java

@@ -1,20 +1,33 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
-import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
+import com.macro.mall.tiny.common.exception.Asserts;
 import com.macro.mall.tiny.modules.business.mapper.KrBLineUploadLogMapper;
+import com.macro.mall.tiny.modules.business.model.KrBLineUploadLog;
 import com.macro.mall.tiny.modules.business.service.KrBLineUploadLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-28
  */
 @Service
 public class KrBLineUploadLogServiceImpl extends ServiceImpl<KrBLineUploadLogMapper, KrBLineUploadLog> implements KrBLineUploadLogService {
 
+    @Autowired
+    private KrBLineUploadLogMapper krBLineUploadLogMapper;
+
+    @Override
+    public List<KrBLineUploadLog> findLastUpload(Integer limit) {
+        if (limit<1) Asserts.fail("请输入大于1的数");
+        return krBLineUploadLogMapper.findLastUpload(limit);
+    }
+
 }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/KrBRegionCityServiceImpl.java

@@ -1,11 +1,16 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.macro.mall.tiny.modules.business.model.KrBRegionCity;
 import com.macro.mall.tiny.modules.business.mapper.KrBRegionCityMapper;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
 import com.macro.mall.tiny.modules.business.service.KrBRegionCityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +22,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class KrBRegionCityServiceImpl extends ServiceImpl<KrBRegionCityMapper, KrBRegionCity> implements KrBRegionCityService {
 
+    @Autowired
+    private KrBRegionCityMapper krBRegionCityMapper;
+
+    @Override
+    public List<KrBRegionCity> getCityListByprovince(String provinceId) {
+        QueryWrapper<KrBRegionCity> cityQueryWrapper = new QueryWrapper<>();
+        cityQueryWrapper.lambda().eq(KrBRegionCity::getProvinceId, provinceId);
+        krBRegionCityMapper.selectList(cityQueryWrapper);
+        return null;
+    }
 }

src/main/resources/mapper/business/BLineUploadLogMapper.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.macro.mall.tiny.modules.business.mapper.BLineUploadLogMapper">
-
-    <select id="findLastUpload" resultMap="BaseResultMap2" parameterType="integer">
-        SELECT ul.id,
-               ul.line_id,
-               l.name line_name,
-               ul.uploader_id,
-               a.username uploader_name,
-               ul.upload_time,
-               ul.status
-        FROM b_line_upload_log ul
-                 LEFT JOIN b_line l ON ul.line_id = l.id
-                 LEFT JOIN ums_admin a ON ul.uploader_id = a.id
-        ORDER BY ul.id DESC
-        LIMIT #{limit};
-    </select>
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.KrBLineUploadLog">
-        <id column="id" property="id" />
-        <result column="line_name" property="lineName" />
-        <result column="uploader_id" property="uploaderId" />
-        <result column="upload_time" property="uploadTime" />
-        <result column="status" property="status" />
-        <result column="warn_msg" property="warnMsg" />
-    </resultMap>
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap2" type="com.macro.mall.tiny.modules.business.model.KrBLineUploadLog">
-        <id column="id" property="id" />
-        <result column="line_id" property="lineId" />
-        <result column="line_name" property="lineName" />
-        <result column="uploader_id" property="uploaderId" />
-        <result column="uploader_name" property="uploaderName" />
-        <result column="upload_time" property="uploadTime" />
-        <result column="status" property="status" />
-        <result column="warn_msg" property="warnMsg" />
-    </resultMap>
-
-</mapper>

src/main/resources/mapper/business/KrBLineUploadLogMapper.xml

@@ -2,11 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.macro.mall.tiny.modules.business.mapper.KrBLineUploadLogMapper">
 
+    <select id="findLastUpload" resultMap="BaseResultMap2" parameterType="integer">
+        SELECT ul.id,
+               ul.line_id,
+               l.name line_name,
+               ul.uploader_id,
+               a.username uploader_name,
+               ul.upload_time,
+               ul.status
+        FROM b_line_upload_log ul
+                 LEFT JOIN b_line l ON ul.line_id = l.id
+                 LEFT JOIN ums_admin a ON ul.uploader_id = a.id
+        ORDER BY ul.id DESC
+        LIMIT #{limit};
+    </select>
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.KrBLineUploadLog">
         <id column="id" property="id" />
+        <result column="line_name" property="lineName" />
+        <result column="uploader_id" property="uploaderId" />
+        <result column="upload_time" property="uploadTime" />
+        <result column="status" property="status" />
+        <result column="warn_msg" property="warnMsg" />
+    </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap2" type="com.macro.mall.tiny.modules.business.model.KrBLineUploadLog">
+        <id column="id" property="id" />
         <result column="line_id" property="lineId" />
+        <result column="line_name" property="lineName" />
         <result column="uploader_id" property="uploaderId" />
+        <result column="uploader_name" property="uploaderName" />
         <result column="upload_time" property="uploadTime" />
         <result column="status" property="status" />
         <result column="warn_msg" property="warnMsg" />