文件暂存

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

@@ -4,7 +4,7 @@ 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.BLineService;
+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;
@@ -27,7 +27,7 @@ import java.util.List;
 public class BLineController {
 
     @Autowired
-    private BLineService lineService;
+    private KrBLineService lineService;
 
 
     @ApiOperation("按照ID获取线路")

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

@@ -2,7 +2,7 @@ package com.macro.mall.tiny.modules.business.controller;
 
 
 import com.macro.mall.tiny.common.api.CommonResult;
-import com.macro.mall.tiny.modules.business.model.BLineUploadLog;
+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;
@@ -30,7 +30,7 @@ public class BLineUploadLogController {
     @ApiOperation("获取最近N条上传记录")
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<List<BLineUploadLog>> getItem(@RequestParam @PathParam(value = "limit") Integer limit) {
+    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

@@ -3,12 +3,11 @@ 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.BProvinceServiceImpl;
+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;
@@ -29,7 +28,7 @@ import java.util.List;
 public class BProvinceController {
 
     @Autowired
-    private BProvinceServiceImpl provinceService;
+    private KrBRegionProvinceServiceImpl provinceService;
 
     @ApiOperation("获取省份列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)

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

@@ -4,7 +4,7 @@ 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.BTowerService;
+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;
@@ -27,7 +27,7 @@ import java.util.Map;
 public class BTowerController {
 
     @Autowired
-    BTowerService towerService;
+    KrBTowerService towerService;
 
     @ApiOperation("获取电塔基本资料")
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)

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

@@ -62,7 +62,7 @@ public class FileController {
     public CommonResult<String> upload(FileUploadParam fileUploadParam) throws IOException {
         String name = fileUploadParam.getName();
         String lineName = fileUploadParam.getLineName();
-        Long provinceId = fileUploadParam.getProvince();
+        String provinceId = fileUploadParam.getProvince();
         Long size = fileUploadParam.getSize();
         Integer chunks = fileUploadParam.getChunks();
         Integer chunk = fileUploadParam.getChunk();

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

@@ -1,6 +1,7 @@
 package com.macro.mall.tiny.modules.business.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-09-07
  */
 @RestController
+@Api(tags = "KrBRegionProvinceController", description = "省份管理")
 @RequestMapping("/business/krBRegionProvince")
 public class KrBRegionProvinceController {
 

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

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull;
 public class FileUploadParam {
 
     @ApiModelProperty(value = "上传压缩包所属省份ID")
-    private Long province;
+    private String province;
 
     @ApiModelProperty(value = "上传文件名称")
     private String name;

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

@@ -1,22 +1,22 @@
-package com.macro.mall.tiny.modules.business.mapper;
-
-import com.macro.mall.tiny.modules.business.model.BLine;
-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-24
- */
-public interface BLineMapper extends BaseMapper<BLine> {
-
-    List<BLine> findListMulti();
-
-    List<BLine> findListByKey(@Param("key") String key);
-}
+//package com.macro.mall.tiny.modules.business.mapper;
+//
+//import com.macro.mall.tiny.modules.business.model.BLine;
+//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-24
+// */
+//public interface BLineMapper extends BaseMapper<BLine> {
+//
+//    List<BLine> findListMulti();
+//
+//    List<BLine> findListByKey(@Param("key") String key);
+//}

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

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

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

@@ -1,16 +1,16 @@
-package com.macro.mall.tiny.modules.business.mapper;
-
-import com.macro.mall.tiny.modules.business.model.BProvince;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 后台角色资源关系表 Mapper 接口
- * </p>
- *
- * @author macro
- * @since 2021-03-19
- */
-public interface BProvinceMapper extends BaseMapper<BProvince> {
-
-}
+//package com.macro.mall.tiny.modules.business.mapper;
+//
+//import com.macro.mall.tiny.modules.business.model.BProvince;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//
+///**
+// * <p>
+// * 后台角色资源关系表 Mapper 接口
+// * </p>
+// *
+// * @author macro
+// * @since 2021-03-19
+// */
+//public interface BProvinceMapper extends BaseMapper<BProvince> {
+//
+//}

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

@@ -1,21 +1,21 @@
-package com.macro.mall.tiny.modules.business.mapper;
-
-import com.macro.mall.tiny.modules.business.model.BTower;
-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-24
- */
-public interface BTowerMapper extends BaseMapper<BTower> {
-
-    long saveAndUpdate(@Param("towerList") List<BTower> towerList);
-
-}
+//package com.macro.mall.tiny.modules.business.mapper;
+//
+//import com.macro.mall.tiny.modules.business.model.BTower;
+//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-24
+// */
+//public interface BTowerMapper extends BaseMapper<BTower> {
+//
+//    long saveAndUpdate(@Param("towerList") List<BTower> towerList);
+//
+//}

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

@@ -1,6 +1,5 @@
 package com.macro.mall.tiny.modules.business.mapper;
 
-import com.macro.mall.tiny.modules.business.model.BLine;
 import com.macro.mall.tiny.modules.business.model.KrBLine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,7 +16,7 @@ import java.util.List;
  */
 public interface KrBLineMapper extends BaseMapper<KrBLine> {
 
-    List<BLine> findListMulti();
+    List<KrBLine> findListMulti();
 
-    List<BLine> findListByKey(@Param("key") String key, @Param("provinceId") String provinceId, @Param("cityId") String cityId);
+    List<KrBLine> findListByKey(@Param("key") String key, @Param("provinceId") String provinceId, @Param("cityId") String cityId);
 }

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

@@ -1,11 +1,14 @@
 package com.macro.mall.tiny.modules.business.mapper;
 
-import com.macro.mall.tiny.modules.business.model.KrBTower;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author macro
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface KrBTowerMapper extends BaseMapper<KrBTower> {
 
+    long saveAndUpdate(@Param("krBTowerList") List<KrBTower> krBTowerList);
+
 }

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

@@ -1,63 +1,63 @@
-package com.macro.mall.tiny.modules.business.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 线路表
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("b_line")
-@ApiModel(value="BLine对象", description="线路表")
-public class BLine implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "线路ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "线路名称")
-    private String name;
-
-    @ApiModelProperty(value = "线路所属省份")
-    private Long provinceId;
-
-    @ApiModelProperty(value = "所属省份")
-    @TableField(exist = false)
-    private String province;
-
-    @ApiModelProperty(value = "创建者ID")
-    private Long creatorId;
-
-
-    @ApiModelProperty(value = "包含铁塔")
-    @TableField(exist = false)
-    private List<BTower> towerList;
-
-    @ApiModelProperty(value = "匹配塔形关键字")
-    @TableField(exist = false)
-    private Set<String> matchShapeList;
-
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-}
+//package com.macro.mall.tiny.modules.business.model;
+//
+//import com.baomidou.mybatisplus.annotation.TableField;
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import java.io.Serializable;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Set;
+//
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//
+///**
+// * <p>
+// * 线路表
+// * </p>
+// *
+// * @author macro
+// * @since 2021-03-24
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = false)
+//@TableName("b_line")
+//@ApiModel(value="BLine对象", description="线路表")
+//public class BLine implements Serializable {
+//
+//    private static final long serialVersionUID=1L;
+//
+//    @ApiModelProperty(value = "线路ID")
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Long id;
+//
+//    @ApiModelProperty(value = "线路名称")
+//    private String name;
+//
+//    @ApiModelProperty(value = "线路所属省份")
+//    private Long provinceId;
+//
+//    @ApiModelProperty(value = "所属省份")
+//    @TableField(exist = false)
+//    private String province;
+//
+//    @ApiModelProperty(value = "创建者ID")
+//    private Long creatorId;
+//
+//
+//    @ApiModelProperty(value = "包含铁塔")
+//    @TableField(exist = false)
+//    private List<BTower> towerList;
+//
+//    @ApiModelProperty(value = "匹配塔形关键字")
+//    @TableField(exist = false)
+//    private Set<String> matchShapeList;
+//
+//    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//}

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

@@ -1,61 +0,0 @@
-package com.macro.mall.tiny.modules.business.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author macro
- * @since 2021-03-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("b_line_upload_log")
-@ApiModel(value="BLineUploadLog对象", description="线路上传记录表")
-public class BLineUploadLog implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "上传记录表")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "上传线路名称")
-    private Long lineId;
-
-    @ApiModelProperty(value = "上传者ID")
-    private Long uploaderId;
-
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "上传日期")
-    private Date uploadTime;
-
-    @ApiModelProperty(value = "上传状态：0-失败，1-成功")
-    private Integer status;
-
-    @ApiModelProperty(value = "警告信息")
-    private String warnMsg;
-
-    @ApiModelProperty(value = "所属线路名称")
-    @TableField(exist = false)
-    private String lineName;
-
-    @ApiModelProperty(value = "上传者名称")
-    @TableField(exist = false)
-    private String uploaderName;
-
-
-}

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

@@ -1,35 +1,35 @@
-package com.macro.mall.tiny.modules.business.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 后台角色资源关系表
- * </p>
- *
- * @author macro
- * @since 2021-03-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("b_province")
-@ApiModel(value="BProvince对象", description="后台角色资源关系表")
-public class BProvince implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "省份名称")
-    private String province;
-
-
-}
+//package com.macro.mall.tiny.modules.business.model;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import java.io.Serializable;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//
+///**
+// * <p>
+// * 后台角色资源关系表
+// * </p>
+// *
+// * @author macro
+// * @since 2021-03-19
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = false)
+//@TableName("b_province")
+//@ApiModel(value="BProvince对象", description="后台角色资源关系表")
+//public class BProvince implements Serializable {
+//
+//    private static final long serialVersionUID=1L;
+//
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Long id;
+//
+//    @ApiModelProperty(value = "省份名称")
+//    private String province;
+//
+//
+//}

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

@@ -1,72 +1,72 @@
-package com.macro.mall.tiny.modules.business.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 塔表
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-@Data
-@TableName("b_tower")
-@ApiModel(value="BTower对象", description="塔表")
-public class BTower implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "杆塔表")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "序号")
-    private Integer sort;
-
-    @ApiModelProperty(value = "杆塔号")
-    private String name;
-
-    @ApiModelProperty(value = "塔形")
-    private String shape;
-
-    @ApiModelProperty(value = "金具串型号")
-    private String hardwareType;
-
-    @ApiModelProperty(value = "线路ID")
-    private Long lineId;
-
-    @ApiModelProperty(value = "经度")
-    private BigDecimal lon;
-
-    @ApiModelProperty(value = "纬度")
-    private BigDecimal lat;
-
-    @ApiModelProperty(value = "是否含有资料")
-    private Integer hasFile;
-
-    @Override
-    public boolean equals(Object obj){
-        BTower tower = (BTower) obj;
-        return this.name.equals(tower.name) && this.lineId.equals(tower.lineId);
-    }
-
-    @Override
-    public int hashCode(){
-        return this.name.hashCode() + this.lineId.intValue();
-    }
-
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-}
+//package com.macro.mall.tiny.modules.business.model;
+//
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//import java.math.BigDecimal;
+//import java.util.Date;
+//
+///**
+// * <p>
+// * 塔表
+// * </p>
+// *
+// * @author macro
+// * @since 2021-03-24
+// */
+//@Data
+//@TableName("b_tower")
+//@ApiModel(value="BTower对象", description="塔表")
+//public class BTower implements Serializable {
+//
+//    private static final long serialVersionUID=1L;
+//
+//    @ApiModelProperty(value = "杆塔表")
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Long id;
+//
+//    @ApiModelProperty(value = "序号")
+//    private Integer sort;
+//
+//    @ApiModelProperty(value = "杆塔号")
+//    private String name;
+//
+//    @ApiModelProperty(value = "塔形")
+//    private String shape;
+//
+//    @ApiModelProperty(value = "金具串型号")
+//    private String hardwareType;
+//
+//    @ApiModelProperty(value = "线路ID")
+//    private Long lineId;
+//
+//    @ApiModelProperty(value = "经度")
+//    private BigDecimal lon;
+//
+//    @ApiModelProperty(value = "纬度")
+//    private BigDecimal lat;
+//
+//    @ApiModelProperty(value = "是否含有资料")
+//    private Integer hasFile;
+//
+//    @Override
+//    public boolean equals(Object obj){
+//        BTower tower = (BTower) obj;
+//        return this.name.equals(tower.name) && this.lineId.equals(tower.lineId);
+//    }
+//
+//    @Override
+//    public int hashCode(){
+//        return this.name.hashCode() + this.lineId.intValue();
+//    }
+//
+//    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//}

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

@@ -33,7 +33,7 @@ public class KrBLine implements Serializable {
 
     @ApiModelProperty(value = "线路表")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "省份id")
     private String provinceId;
@@ -71,11 +71,11 @@ public class KrBLine implements Serializable {
     private String endTower;
 
     @ApiModelProperty(value = "创建人")
-    private Integer creatorId;
+    private Long creatorId;
 
     @ApiModelProperty(value = "包含铁塔")
     @TableField(exist = false)
-    private List<BTower> towerList;
+    private List<KrBTower> towerList;
 
     @ApiModelProperty(value = "匹配塔形关键字")
     @TableField(exist = false)

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

@@ -1,10 +1,13 @@
 package com.macro.mall.tiny.modules.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,12 +19,12 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("kr_b_line_upload_log")
-@ApiModel(value="KrBLineUploadLog对象", description="文件上传记录表")
+@ApiModel(value="BLineUploadLog对象", description="线路上传记录表")
 public class KrBLineUploadLog implements Serializable {
 
     private static final long serialVersionUID=1L;
@@ -30,20 +33,29 @@ public class KrBLineUploadLog implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "上传线路ID")
+    @ApiModelProperty(value = "上传线路名称")
     private Long lineId;
 
     @ApiModelProperty(value = "上传者ID")
     private Long uploaderId;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上传日期")
     private Date uploadTime;
 
     @ApiModelProperty(value = "上传状态：0-失败，1-成功")
-    private Boolean status;
+    private Integer status;
 
     @ApiModelProperty(value = "警告信息")
     private String warnMsg;
 
+    @ApiModelProperty(value = "所属线路名称")
+    @TableField(exist = false)
+    private String lineName;
+
+    @ApiModelProperty(value = "上传者名称")
+    @TableField(exist = false)
+    private String uploaderName;
+
 
 }

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

@@ -24,7 +24,7 @@ public class KrBRegionCity implements Serializable {
     private static final long serialVersionUID=1L;
 
     @ApiModelProperty(value = "@desc: 自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "@desc: 区、县名称")
     private String name;

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

@@ -24,7 +24,7 @@ public class KrBRegionCounty implements Serializable {
     private static final long serialVersionUID=1L;
 
     @ApiModelProperty(value = "@desc: 自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "@desc: 区、县名称")
     private String name;

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

@@ -24,7 +24,7 @@ public class KrBRegionProvince implements Serializable {
     private static final long serialVersionUID=1L;
 
     @ApiModelProperty(value = "@desc： 自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "@desc： 省名称")
     private String name;

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

@@ -3,6 +3,7 @@ package com.macro.mall.tiny.modules.business.model;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,10 +29,10 @@ public class KrBTower implements Serializable {
 
     @ApiModelProperty(value = "杆塔详情表")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "线路ID")
-    private Integer lineId;
+    private Long lineId;
 
     @ApiModelProperty(value = "杆塔序号（对应机器巡检方案号）")
     private Integer towerIndex;
@@ -88,8 +89,9 @@ public class KrBTower implements Serializable {
     private Integer hasFile;
 
     @ApiModelProperty(value = "创建者id")
-    private Integer creatorId;
+    private Long creatorId;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 

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

@@ -1,19 +0,0 @@
-package com.macro.mall.tiny.modules.business.service;
-
-import com.macro.mall.tiny.modules.business.model.BLine;
-
-import java.util.List;
-
-/**
- * @author gjs
- * @description
- * @date 2021/3/24 14:38
- */
-public interface BLineCacheService {
-
-    List<BLine> getLineList();
-
-    void setLineList(List<BLine> lineList);
-
-    void delLineList();
-}

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

@@ -1,24 +0,0 @@
-package com.macro.mall.tiny.modules.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.macro.mall.tiny.modules.business.model.BFile;
-import com.macro.mall.tiny.modules.business.model.BLine;
-
-import java.util.List;
-
-/**
- * <p>
- * 线路表 服务类
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-public interface BLineService extends IService<BLine> {
-
-    List<BLine> getLineList();
-
-    List<BLine> findByKey(String key);
-
-    List<BFile> getFile(Long id);
-}

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

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

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

@@ -1,16 +0,0 @@
-package com.macro.mall.tiny.modules.business.service;
-
-
-import com.macro.mall.tiny.modules.business.model.BProvince;
-
-import java.util.List;
-
-/**
- * 省份缓存
- */
-public interface BProvinceCacheService {
-
-    List<BProvince> getProvinceList();
-
-    void setProvinceList(List<BProvince> provinceList);
-}

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

@@ -1,19 +0,0 @@
-package com.macro.mall.tiny.modules.business.service;
-
-import com.macro.mall.tiny.modules.business.model.BProvince;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 后台角色资源关系表 服务类
- * </p>
- *
- * @author macro
- * @since 2021-03-19
- */
-public interface BProvinceService extends IService<BProvince> {
-
-    List<BProvince> getProvinceList();
-}

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

@@ -1,29 +0,0 @@
-package com.macro.mall.tiny.modules.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.macro.mall.tiny.domain.AdminUserDetails;
-import com.macro.mall.tiny.modules.business.model.BFile;
-import com.macro.mall.tiny.modules.business.model.BTower;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 塔表 服务类
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-public interface BTowerService extends IService<BTower> {
-
-    long saveAndUpdate(List<BTower> towerList);
-
-    Map<String, List<BFile>> getFile(Long id);
-
-    void setHasFile(List<BTower> towerList);
-
-    void setHasFile(List<BTower> towerList, AdminUserDetails userDetails);
-
-}

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, Long provinceId, Long size, Integer chunks, Integer chunk, MultipartFile file, String charset) throws IOException;
+    void uploadWithBlock(String name, String lineName, String provinceId, Long size, Integer chunks, Integer chunk, MultipartFile file, String charset) throws IOException;
 
     BDirectory getRootDirectory();
 

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

@@ -0,0 +1,19 @@
+package com.macro.mall.tiny.modules.business.service;
+
+import com.macro.mall.tiny.modules.business.model.KrBLine;
+
+import java.util.List;
+
+/**
+ * @author gjs
+ * @description
+ * @date 2021/3/24 14:38
+ */
+public interface KrBLineCacheService {
+
+    List<KrBLine> getLineList();
+
+    void setLineList(List<KrBLine> lineList);
+
+    void delLineList();
+}

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

@@ -1,16 +1,24 @@
 package com.macro.mall.tiny.modules.business.service;
 
-import com.macro.mall.tiny.modules.business.model.KrBLine;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.macro.mall.tiny.modules.business.model.BFile;
+import com.macro.mall.tiny.modules.business.model.KrBLine;
+
+import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 线路表 服务类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-24
  */
 public interface KrBLineService extends IService<KrBLine> {
 
+    List<KrBLine> getLineList();
+
+    List<KrBLine> findByKey(String key, String provinceId, String cityId);
+
+    List<BFile> getFile(Long id);
 }

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

@@ -0,0 +1,16 @@
+package com.macro.mall.tiny.modules.business.service;
+
+
+import com.macro.mall.tiny.modules.business.model.KrBRegionProvince;
+
+import java.util.List;
+
+/**
+ * 省份缓存
+ */
+public interface KrBRegionProvinceCacheService {
+
+    List<KrBRegionProvince> getProvinceList();
+
+    void setProvinceList(List<KrBRegionProvince> provinceList);
+}

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

@@ -1,16 +1,19 @@
 package com.macro.mall.tiny.modules.business.service;
 
-import com.macro.mall.tiny.modules.business.model.KrBRegionProvince;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.macro.mall.tiny.modules.business.model.KrBRegionProvince;
+
+import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 后台角色资源关系表 服务类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-19
  */
 public interface KrBRegionProvinceService extends IService<KrBRegionProvince> {
 
+    List<KrBRegionProvince> getProvinceList();
 }

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

@@ -1,16 +1,29 @@
 package com.macro.mall.tiny.modules.business.service;
 
-import com.macro.mall.tiny.modules.business.model.KrBTower;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.macro.mall.tiny.domain.AdminUserDetails;
+import com.macro.mall.tiny.modules.business.model.BFile;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
- *  服务类
+ * 塔表 服务类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-24
  */
 public interface KrBTowerService extends IService<KrBTower> {
 
+    long saveAndUpdate(List<KrBTower> towerList);
+
+    Map<String, List<BFile>> getFile(Long id);
+
+    void setHasFile(List<KrBTower> towerList);
+
+    void setHasFile(List<KrBTower> towerList, AdminUserDetails userDetails);
+
 }

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

@@ -45,53 +45,53 @@ public class AsyncHandler {
     private UmsAdminService adminService;
 
     @Autowired
-    private BProvinceServiceImpl provinceService;
+    private KrBRegionProvinceServiceImpl krBRegionProvinceService;
 
     @Autowired
-    private BLineService lineService;
+    private KrBLineService krBLineService;
 
     @Autowired
     private BLineUploadLogService lineUploadLogService;
 
     @Autowired
-    private BTowerService towerService;
+    private KrBTowerService krBTowerService;
 
     @Autowired
-    private BLineCacheService lineCacheService;
+    private KrBLineCacheService krBLineCacheService;
 
     @Autowired
     private BDirectoryCacheService directoryCacheService;
 
     @Async
     @Transactional
-    public void handleDocument(Long provinceId, String fileSource, String lineName, AdminUserDetails userDetails, String charset) {
+    public void handleDocument(String provinceId, String fileSource, String lineName, AdminUserDetails userDetails, String charset) {
         StringBuilder warnMsg = new StringBuilder();
-        BLine line = null;
+        KrBLine line = null;
         Long userId = null;
         try {
             if (provinceId == null) Asserts.fail("上传失败，省份不能为空，provinceId：" + provinceId);
             if (userDetails == null) Asserts.fail("上传失败，未获取到当前用户");
 
-            BProvince province = provinceService.getById(provinceId);
-            String provinceName = province.getProvince();
+            KrBRegionProvince province = krBRegionProvinceService.getById(provinceId);
+            String provinceName = province.getName();
 
             String username = userDetails.getUsername();
             UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
             userId = umsAdmin.getId();
             boolean canCover = AuthUtil.checkAccess(userDetails, AuthUtil.COVER);
             // 查看是否为线路创建者
-            QueryWrapper<BLine> wrapper = new QueryWrapper<>();
-            wrapper.lambda().eq(BLine::getName, lineName);
-            line = lineService.getOne(wrapper);
-            List<BTower> towerList = Lists.newArrayList();
+            QueryWrapper<KrBLine> wrapper = new QueryWrapper<>();
+            wrapper.lambda().eq(KrBLine::getLineName, lineName);
+            line = krBLineService.getOne(wrapper);
+            List<KrBTower> towerList = Lists.newArrayList();
             if (line == null) {
                 // 如果为空，则创建新线路
-                BLine newLine = new BLine();
+                KrBLine newLine = new KrBLine();
                 newLine.setCreatorId(userId);
-                newLine.setName(lineName);
+                newLine.setLineName(lineName);
                 newLine.setProvinceId(provinceId);
                 newLine.setCreateTime(new Date());
-                lineService.save(newLine);
+                krBLineService.save(newLine);
                 line = newLine;
 
                 canCover = true;
@@ -184,7 +184,7 @@ public class AsyncHandler {
                 }
             });
             // 存储上传记录
-            BLineUploadLog lineUploadLog = new BLineUploadLog();
+            KrBLineUploadLog lineUploadLog = new KrBLineUploadLog();
             lineUploadLog.setLineId(line.getId());
             lineUploadLog.setStatus(1);
             lineUploadLog.setUploaderId(userId);
@@ -195,13 +195,13 @@ public class AsyncHandler {
             // 后续更新塔是否包含资料
             QueryWrapper<BTower> towerWrapper = new QueryWrapper<>();
             towerWrapper.lambda().eq(BTower::getLineId, line.getId());
-            List<BTower> oriTowerList = towerService.list(towerWrapper);
+            List<BTower> oriTowerList = krBTowerService.list(towerWrapper);
             HashSet<BTower> towerSet = new HashSet<>(oriTowerList);
             towerSet.addAll(towerList);
-            towerService.setHasFile(new ArrayList<>(towerSet), userDetails);
+            krBTowerService.setHasFile(new ArrayList<>(towerSet), userDetails);
 
             // 后续清楚缓存处理
-            lineCacheService.delLineList();
+            krBLineCacheService.delLineList();
             directoryCacheService.delDirectory();
         } catch (ApiException e) {
             log.error("上传文件抛出业务异常", e);
@@ -209,7 +209,7 @@ public class AsyncHandler {
             log.error("上传文件抛出异常", e);
             if (line != null && userId != null) {
                 // 存储上传记录
-                BLineUploadLog lineUploadLog = new BLineUploadLog();
+                KrBLineUploadLog lineUploadLog = new KrBLineUploadLog();
                 lineUploadLog.setLineId(line.getId());
                 lineUploadLog.setStatus(0);
                 lineUploadLog.setUploaderId(userId);

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

@@ -1,89 +0,0 @@
-package com.macro.mall.tiny.modules.business.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.macro.mall.tiny.common.exception.Asserts;
-import com.macro.mall.tiny.common.util.MyFileUtils;
-import com.macro.mall.tiny.config.UploadConfig;
-import com.macro.mall.tiny.modules.business.mapper.BLineMapper;
-import com.macro.mall.tiny.modules.business.mapper.BProvinceMapper;
-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.model.BProvince;
-import com.macro.mall.tiny.modules.business.model.BTower;
-import com.macro.mall.tiny.modules.business.service.BLineCacheService;
-import com.macro.mall.tiny.modules.business.service.BLineService;
-import com.macro.mall.tiny.security.util.AuthUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 线路表 服务实现类
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-@Service
-public class BLineServiceImpl extends ServiceImpl<BLineMapper, BLine> implements BLineService {
-
-    @Autowired
-    private BLineCacheService lineCacheService;
-
-    @Autowired
-    private BLineMapper lineMapper;
-
-    @Autowired
-    BProvinceMapper provinceMapper;
-
-    @Override
-    public List<BLine> getLineList() {
-        List<BLine> lineList = lineCacheService.getLineList();
-        if (CollUtil.isNotEmpty(lineList)) {
-            return lineList;
-        }
-        lineList = lineMapper.findListMulti();
-        if (CollUtil.isNotEmpty(lineList)) {
-            lineCacheService.setLineList(lineList);
-        } else {
-            lineCacheService.setLineList(new ArrayList<>());
-        }
-        return lineList;
-    }
-
-    @Override
-    public List<BLine> findByKey(String key) {
-        List<BLine> lineList = lineMapper.findListByKey(key);
-        if (StringUtils.isNotBlank(key)) {
-            lineList.forEach(line -> {
-                if (!line.getProvince().contains(key) && !line.getName().contains(key)) {
-                    String keyLow = key.toLowerCase();
-                    Set<String> matchShapeList = line.getTowerList().stream()
-                            .filter(tower-> tower.getShape().toLowerCase().contains(keyLow))
-                            .map(BTower::getShape).collect(Collectors.toSet());
-                    line.setMatchShapeList(matchShapeList);
-                }
-            });
-        }
-        return lineList;
-    }
-
-    @Override
-    public List<BFile> getFile(Long id) {
-        boolean auth = AuthUtil.checkAccess(AuthUtil.ACCESS);
-        BLine line = lineMapper.selectById(id);
-        if (line == null) Asserts.fail("该线路不存在，id：" + id);
-        BProvince province = provinceMapper.selectById(line.getProvinceId());
-        String basePath = UploadConfig.powerPath +
-                province.getProvince() + UploadConfig.SEPARATOR +
-                line.getName();
-        return MyFileUtils.getSubBFiles(basePath, auth);
-    }
-}

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

@@ -1,7 +1,7 @@
 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.BLineUploadLog;
+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;
@@ -19,13 +19,13 @@ import java.util.List;
  * @since 2021-03-28
  */
 @Service
-public class BLineUploadLogServiceImpl extends ServiceImpl<BLineUploadLogMapper, BLineUploadLog> implements BLineUploadLogService {
+public class BLineUploadLogServiceImpl extends ServiceImpl<BLineUploadLogMapper, KrBLineUploadLog> implements BLineUploadLogService {
 
     @Autowired
     private BLineUploadLogMapper lineUploadLogMapper;
 
     @Override
-    public List<BLineUploadLog> findLastUpload(Integer limit) {
+    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/BProvinceServiceImpl.java

@@ -1,47 +0,0 @@
-package com.macro.mall.tiny.modules.business.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.macro.mall.tiny.modules.business.model.BProvince;
-import com.macro.mall.tiny.modules.business.mapper.BProvinceMapper;
-import com.macro.mall.tiny.modules.business.service.BProvinceCacheService;
-import com.macro.mall.tiny.modules.business.service.BProvinceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 后台角色资源关系表 服务实现类
- * </p>
- *
- * @author macro
- * @since 2021-03-19
- */
-@Service
-public class BProvinceServiceImpl extends ServiceImpl<BProvinceMapper, BProvince> implements BProvinceService {
-
-    @Autowired
-    private BProvinceCacheService provinceCacheService;
-
-    @Autowired
-    private BProvinceMapper provinceMapper;
-
-    @Override
-    public List<BProvince> getProvinceList() {
-        List<BProvince> provinceList = provinceCacheService.getProvinceList();
-        if(CollUtil.isNotEmpty(provinceList)){
-            return  provinceList;
-        }
-        provinceList = provinceMapper.selectList(new QueryWrapper<>());
-        if (CollUtil.isNotEmpty(provinceList)) {
-            provinceCacheService.setProvinceList(provinceList);
-        } else {
-            provinceCacheService.setProvinceList(new ArrayList<>());
-        }
-        return provinceList;
-    }
-}

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

@@ -1,175 +0,0 @@
-package com.macro.mall.tiny.modules.business.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
-import com.macro.mall.tiny.common.exception.Asserts;
-import com.macro.mall.tiny.common.util.MyFileUtils;
-import com.macro.mall.tiny.config.UploadConfig;
-import com.macro.mall.tiny.domain.AdminUserDetails;
-import com.macro.mall.tiny.modules.business.enums.DirectoryEnum;
-import com.macro.mall.tiny.modules.business.mapper.BLineMapper;
-import com.macro.mall.tiny.modules.business.mapper.BProvinceMapper;
-import com.macro.mall.tiny.modules.business.mapper.BTowerMapper;
-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.model.BProvince;
-import com.macro.mall.tiny.modules.business.model.BTower;
-import com.macro.mall.tiny.modules.business.service.BTowerService;
-import com.macro.mall.tiny.security.util.AuthUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-
-import java.io.FilenameFilter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 塔表 服务实现类
- * </p>
- *
- * @author macro
- * @since 2021-03-24
- */
-@Service
-public class BTowerServiceImpl extends ServiceImpl<BTowerMapper, BTower> implements BTowerService {
-
-    @Autowired
-    BTowerMapper towerMapper;
-
-    @Autowired
-    BLineMapper lineMapper;
-
-    @Autowired
-    BProvinceMapper provinceMapper;
-
-    @Override
-    public long saveAndUpdate(List<BTower> towerList) {
-        return towerMapper.saveAndUpdate(towerList);
-    }
-
-    @Override
-    public Map<String, List<BFile>> getFile(Long id) {
-        boolean auth = AuthUtil.checkAccess(AuthUtil.ACCESS);
-
-        HashMap<String, List<BFile>> resultMap = new HashMap<>();
-
-        BTower tower = towerMapper.selectById(id);
-        if (tower == null) Asserts.fail("该电塔不存在，id：" + id);
-        BLine line = lineMapper.selectById(tower.getLineId());
-        if (line == null) Asserts.fail("该电塔所在的线路不存在，lineId：" + tower.getLineId());
-        BProvince province = provinceMapper.selectById(line.getProvinceId());
-        String basePath = UploadConfig.powerPath +
-                province.getProvince() + UploadConfig.SEPARATOR +
-                line.getName();
-
-        String secBasePath;
-        String thirdBasePath;
-        List<BFile> sonList;
-        // 获取3杆塔图纸
-        String shape = tower.getShape();
-        int lastIndex = shape.lastIndexOf('-');
-        if (lastIndex > 0) {
-            shape = shape.substring(0, lastIndex).replace('/', ' ');
-        }
-        if (StringUtils.isNotBlank(shape)) {
-            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), auth);
-            thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, auth);
-            sonList = MyFileUtils.getSubBFiles(thirdBasePath, auth);
-        } else {
-            sonList = Lists.newArrayList();
-        }
-        resultMap.put("shapeFileList", sonList);
-
-        // 获取6地线金具串图
-        secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), auth);
-        String hardwareType = tower.getHardwareType().replace('/', ' ');
-        if (StringUtils.isNotBlank(hardwareType)) {
-            FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareType) || (name.startsWith(UploadConfig.AUTH_STR + hardwareType) && auth);
-            sonList = MyFileUtils.getSubBFiles(secBasePath, hardwareTypeFilter, auth);
-        } else {
-            sonList = Lists.newArrayList();
-        }
-        resultMap.put("hardwareFileList", sonList);
-
-        // 获取7班组巡检照片
-        secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TEAM_CHECK_PIC.getName(), auth);
-        String towerName = tower.getName();
-        thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, towerName, auth);
-        sonList = MyFileUtils.getSubBFiles(thirdBasePath, auth);
-        resultMap.put("teamCheckFileList", sonList);
-
-        return resultMap;
-    }
-
-    @Override
-    public void setHasFile(List<BTower> towerList) {
-        AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        setHasFile(towerList, userDetails);
-    }
-
-    @Override
-    public void setHasFile(List<BTower> towerList, AdminUserDetails userDetails) {
-        if (towerList == null || towerList.size() == 0) {
-            return;
-        }
-        boolean access = AuthUtil.checkAccess(userDetails, AuthUtil.ACCESS);
-        BTower firstTower = towerList.get(0);
-        BLine line = lineMapper.selectById(firstTower.getLineId());
-        BProvince province = provinceMapper.selectById(line.getProvinceId());
-        String basePath = UploadConfig.powerPath +
-                province.getProvince() + UploadConfig.SEPARATOR +
-                line.getName();
-
-        for (BTower tower : towerList) {
-            String secBasePath;
-            String thirdBasePath;
-
-            // 检验是否包含塔形资料
-            String shape = tower.getShape();
-            if (StringUtils.isNotBlank(shape)) {
-                int lastIndex = shape.lastIndexOf('-');
-                if (lastIndex > 0) {
-                    shape = shape.substring(0, lastIndex).replace('/', ' ');
-                }
-                if (StringUtils.isNotBlank(shape)) {
-                    secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), access);
-                    thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, access);
-                    if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
-                        tower.setHasFile(1);
-                        continue;
-                    }
-                }
-            }
-
-            // 检验是否含有金具串资料
-            String hardwareType = tower.getHardwareType();
-            if (StringUtils.isNotBlank(hardwareType)) {
-                secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), access);
-                String hardwareTypeReplace = hardwareType.replace('/', ' ');
-                FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareTypeReplace) || (name.startsWith(UploadConfig.AUTH_STR + hardwareTypeReplace) && access);
-                if (MyFileUtils.hasSonFile(secBasePath, hardwareTypeFilter, access)) {
-                    tower.setHasFile(1);
-                    continue;
-                }
-            }
-
-            // 检验是否含有巡检照片
-            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TEAM_CHECK_PIC.getName(), access);
-            thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, tower.getName(), access);
-            if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
-                tower.setHasFile(1);
-                continue;
-            }
-
-
-            tower.setHasFile(0);
-        }
-
-        towerMapper.saveAndUpdate(towerList);
-    }
-
-}

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

@@ -6,13 +6,13 @@ import com.macro.mall.tiny.common.util.MyFileUtils;
 import com.macro.mall.tiny.config.UploadConfig;
 import com.macro.mall.tiny.domain.AdminUserDetails;
 import com.macro.mall.tiny.modules.business.enums.DirectoryEnum;
-import com.macro.mall.tiny.modules.business.mapper.BLineMapper;
-import com.macro.mall.tiny.modules.business.mapper.BTowerMapper;
+import com.macro.mall.tiny.modules.business.mapper.KrBLineMapper;
+import com.macro.mall.tiny.modules.business.mapper.KrBTowerMapper;
 import com.macro.mall.tiny.modules.business.model.*;
 import com.macro.mall.tiny.modules.business.service.BDirectoryCacheService;
-import com.macro.mall.tiny.modules.business.service.BLineCacheService;
-import com.macro.mall.tiny.modules.business.service.BTowerService;
 import com.macro.mall.tiny.modules.business.service.FileService;
+import com.macro.mall.tiny.modules.business.service.KrBLineCacheService;
+import com.macro.mall.tiny.modules.business.service.KrBTowerService;
 import com.macro.mall.tiny.security.util.AuthUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,16 +44,16 @@ public class FileServiceImpl implements FileService {
     private BDirectoryCacheService directoryCacheService;
 
     @Autowired
-    private BTowerService towerService;
+    private KrBTowerService towerService;
 
     @Autowired
-    private BTowerMapper towerMapper;
+    private KrBTowerMapper towerMapper;
 
     @Autowired
-    private BLineMapper lineMapper;
+    private KrBLineMapper lineMapper;
 
     @Autowired
-    private BLineCacheService lineCacheService;
+    private KrBLineCacheService lineCacheService;
 
     /**
      * 上传文件
@@ -76,7 +76,7 @@ public class FileServiceImpl implements FileService {
      */
     public void uploadWithBlock(String name,
                                 String lineName,
-                                Long provinceId,
+                                String provinceId,
                                 Long size,
                                 Integer chunks,
                                 Integer chunk,
@@ -160,19 +160,19 @@ public class FileServiceImpl implements FileService {
 
         String provinceStr = filePath.getName(powerPathCount).toString();
         String lineNameStr = filePath.getName(powerPathCount + 1).toString();
-        QueryWrapper<BLine> lineQueryWrapper = new QueryWrapper<>();
-        lineQueryWrapper.lambda().eq(BLine::getProvince, provinceStr).eq(BLine::getName, lineNameStr);
-        BLine line = lineMapper.selectOne(lineQueryWrapper);
+        QueryWrapper<KrBLine> lineQueryWrapper = new QueryWrapper<>();
+        lineQueryWrapper.lambda().eq(KrBLine::getProvince, provinceStr).eq(KrBLine::getLineName, lineNameStr);
+        KrBLine line = lineMapper.selectOne(lineQueryWrapper);
 
         if (line != null) {
-            QueryWrapper<BTower> towerQueryWrapper = new QueryWrapper<>();
-            towerQueryWrapper.lambda().eq(BTower::getLineId, line.getId());
+            QueryWrapper<KrBTower> towerQueryWrapper = new QueryWrapper<>();
+            towerQueryWrapper.lambda().eq(KrBTower::getLineId, line.getId());
 
             if (relativeCount == 2) {
                 lineMapper.deleteById(line.getId());
                 towerMapper.delete(towerQueryWrapper);
             } else {
-                List<BTower> towerList = towerMapper.selectList(towerQueryWrapper);
+                List<KrBTower> towerList = towerMapper.selectList(towerQueryWrapper);
                 towerService.setHasFile(towerList);
             }
         }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BLineCacheServiceImpl.java → src/main/java/com/macro/mall/tiny/modules/business/service/impl/KrBLineCacheServiceImpl.java

@@ -1,8 +1,8 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
 import com.macro.mall.tiny.common.service.RedisService;
-import com.macro.mall.tiny.modules.business.model.BLine;
-import com.macro.mall.tiny.modules.business.service.BLineCacheService;
+import com.macro.mall.tiny.modules.business.model.KrBLine;
+import com.macro.mall.tiny.modules.business.service.KrBLineCacheService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ import java.util.List;
  * @date 2021/3/24 14:40
  */
 @Service
-public class BLineCacheServiceImpl implements BLineCacheService {
+public class KrBLineCacheServiceImpl implements KrBLineCacheService {
 
     @Autowired
     private RedisService redisService;
@@ -27,13 +27,13 @@ public class BLineCacheServiceImpl implements BLineCacheService {
     private String REDIS_KEY_LINE_LIST;
 
     @Override
-    public List<BLine> getLineList() {
+    public List<KrBLine> getLineList() {
         String key = REDIS_DATABASE + ":" + REDIS_KEY_LINE_LIST;
-        return (List<BLine>) redisService.get(key);
+        return (List<KrBLine>) redisService.get(key);
     }
 
     @Override
-    public void setLineList(List<BLine> lineList) {
+    public void setLineList(List<KrBLine> lineList) {
         String key = REDIS_DATABASE + ":" + REDIS_KEY_LINE_LIST;
         redisService.set(key, lineList, REDIS_EXPIRE);
     }

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

@@ -1,20 +1,89 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
-import com.macro.mall.tiny.modules.business.model.KrBLine;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.macro.mall.tiny.common.exception.Asserts;
+import com.macro.mall.tiny.common.util.MyFileUtils;
+import com.macro.mall.tiny.config.UploadConfig;
 import com.macro.mall.tiny.modules.business.mapper.KrBLineMapper;
+import com.macro.mall.tiny.modules.business.mapper.KrBRegionProvinceMapper;
+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.model.KrBRegionProvince;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
+import com.macro.mall.tiny.modules.business.service.KrBLineCacheService;
 import com.macro.mall.tiny.modules.business.service.KrBLineService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.macro.mall.tiny.security.util.AuthUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * <p>
- *  服务实现类
+ * 线路表 服务实现类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-24
  */
 @Service
 public class KrBLineServiceImpl extends ServiceImpl<KrBLineMapper, KrBLine> implements KrBLineService {
 
+    @Autowired
+    private KrBLineCacheService krBLineCacheService;
+
+    @Autowired
+    private KrBLineMapper krBLineMapper;
+
+    @Autowired
+    KrBRegionProvinceMapper krBRegionProvinceMapper;
+
+    @Override
+    public List<KrBLine> getLineList() {
+        List<KrBLine> lineList = krBLineCacheService.getLineList();
+        if (CollUtil.isNotEmpty(lineList)) {
+            return lineList;
+        }
+        lineList = krBLineMapper.findListMulti();
+        if (CollUtil.isNotEmpty(lineList)) {
+            krBLineCacheService.setLineList(lineList);
+        } else {
+            krBLineCacheService.setLineList(new ArrayList<>());
+        }
+        return lineList;
+    }
+
+    @Override
+    public List<KrBLine> findByKey(String key, String provinceId, String cityId) {
+        List<KrBLine> lineList = krBLineMapper.findListByKey(key, provinceId, cityId);
+        if (StringUtils.isNotBlank(key)) {
+            lineList.forEach(line -> {
+                if (!line.getProvince().contains(key) && !line.getLineName().contains(key)) {
+                    String keyLow = key.toLowerCase();
+                    Set<String> matchShapeList = line.getTowerList().stream()
+                            .filter(tower -> tower.getTowerNumber().toLowerCase().contains(keyLow))
+                            .map(KrBTower::getTowerNumber).collect(Collectors.toSet());
+                    line.setMatchShapeList(matchShapeList);
+                }
+            });
+        }
+        return lineList;
+    }
+
+    @Override
+    public List<BFile> getFile(Long id) {
+        boolean auth = AuthUtil.checkAccess(AuthUtil.ACCESS);
+        KrBLine line = krBLineMapper.selectById(id);
+        if (line == null) Asserts.fail("该线路不存在，id：" + id);
+        KrBRegionProvince province = krBRegionProvinceMapper.selectById(line.getProvinceId());
+        String basePath = UploadConfig.powerPath +
+                province.getName() + UploadConfig.SEPARATOR +
+                line.getLineName();
+        return MyFileUtils.getSubBFiles(basePath, auth);
+    }
 }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BProvinceCacheServiceImpl.java → src/main/java/com/macro/mall/tiny/modules/business/service/impl/KrBRegionProvinceCacheServiceImpl.java

@@ -1,8 +1,8 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
 import com.macro.mall.tiny.common.service.RedisService;
-import com.macro.mall.tiny.modules.business.model.BProvince;
-import com.macro.mall.tiny.modules.business.service.BProvinceCacheService;
+import com.macro.mall.tiny.modules.business.model.KrBRegionProvince;
+import com.macro.mall.tiny.modules.business.service.KrBRegionProvinceCacheService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ import java.util.List;
  * @date 2021/3/19 0:32
  */
 @Service
-public class BProvinceCacheServiceImpl implements BProvinceCacheService {
+public class KrBRegionProvinceCacheServiceImpl implements KrBRegionProvinceCacheService {
 
     @Autowired
     private RedisService redisService;
@@ -27,13 +27,13 @@ public class BProvinceCacheServiceImpl implements BProvinceCacheService {
     private String REDIS_KEY_PROVINCE_LIST;
 
     @Override
-    public List<BProvince> getProvinceList() {
+    public List<KrBRegionProvince> getProvinceList() {
         String key = REDIS_DATABASE + ":" + REDIS_KEY_PROVINCE_LIST;
-        return (List<BProvince>) redisService.get(key);
+        return (List<KrBRegionProvince>) redisService.get(key);
     }
 
     @Override
-    public void setProvinceList(List<BProvince> provinceList) {
+    public void setProvinceList(List<KrBRegionProvince> provinceList) {
         String key = REDIS_DATABASE + ":" + REDIS_KEY_PROVINCE_LIST;
         redisService.set(key, provinceList, REDIS_EXPIRE);
     }

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

@@ -1,20 +1,47 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
-import com.macro.mall.tiny.modules.business.model.KrBRegionProvince;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.macro.mall.tiny.modules.business.mapper.KrBRegionProvinceMapper;
+import com.macro.mall.tiny.modules.business.model.KrBRegionProvince;
+import com.macro.mall.tiny.modules.business.service.KrBRegionProvinceCacheService;
 import com.macro.mall.tiny.modules.business.service.KrBRegionProvinceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
- *  服务实现类
+ * 后台角色资源关系表 服务实现类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-19
  */
 @Service
 public class KrBRegionProvinceServiceImpl extends ServiceImpl<KrBRegionProvinceMapper, KrBRegionProvince> implements KrBRegionProvinceService {
 
+    @Autowired
+    private KrBRegionProvinceCacheService krBRegionProvinceCacheService;
+
+    @Autowired
+    private KrBRegionProvinceMapper krBRegionProvinceMapper;
+
+    @Override
+    public List<KrBRegionProvince> getProvinceList() {
+        List<KrBRegionProvince> provinceList = krBRegionProvinceCacheService.getProvinceList();
+        if (CollUtil.isNotEmpty(provinceList)) {
+            return provinceList;
+        }
+        provinceList = krBRegionProvinceMapper.selectList(new QueryWrapper<>());
+        if (CollUtil.isNotEmpty(provinceList)) {
+            krBRegionProvinceCacheService.setProvinceList(provinceList);
+        } else {
+            krBRegionProvinceCacheService.setProvinceList(new ArrayList<>());
+        }
+        return provinceList;
+    }
 }

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

@@ -1,20 +1,175 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
-import com.macro.mall.tiny.modules.business.model.KrBTower;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.macro.mall.tiny.common.exception.Asserts;
+import com.macro.mall.tiny.common.util.MyFileUtils;
+import com.macro.mall.tiny.config.UploadConfig;
+import com.macro.mall.tiny.domain.AdminUserDetails;
+import com.macro.mall.tiny.modules.business.enums.DirectoryEnum;
+import com.macro.mall.tiny.modules.business.mapper.KrBLineMapper;
+import com.macro.mall.tiny.modules.business.mapper.KrBRegionProvinceMapper;
 import com.macro.mall.tiny.modules.business.mapper.KrBTowerMapper;
+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.model.KrBRegionProvince;
+import com.macro.mall.tiny.modules.business.model.KrBTower;
 import com.macro.mall.tiny.modules.business.service.KrBTowerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.macro.mall.tiny.security.util.AuthUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
+import java.io.FilenameFilter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
- *  服务实现类
+ * 塔表 服务实现类
  * </p>
  *
  * @author macro
- * @since 2021-09-07
+ * @since 2021-03-24
  */
 @Service
 public class KrBTowerServiceImpl extends ServiceImpl<KrBTowerMapper, KrBTower> implements KrBTowerService {
 
+    @Autowired
+    KrBTowerMapper krBTowerMapper;
+
+    @Autowired
+    KrBLineMapper krBLineMapper;
+
+    @Autowired
+    KrBRegionProvinceMapper krBRegionProvinceMapper;
+
+    @Override
+    public long saveAndUpdate(List<KrBTower> krBTowerList) {
+        return krBTowerMapper.saveAndUpdate(krBTowerList);
+    }
+
+    @Override
+    public Map<String, List<BFile>> getFile(Long id) {
+        boolean auth = AuthUtil.checkAccess(AuthUtil.ACCESS);
+
+        HashMap<String, List<BFile>> resultMap = new HashMap<>();
+
+        KrBTower tower = krBTowerMapper.selectById(id);
+        if (tower == null) Asserts.fail("该电塔不存在，id：" + id);
+        KrBLine line = krBLineMapper.selectById(tower.getLineId());
+        if (line == null) Asserts.fail("该电塔所在的线路不存在，lineId：" + tower.getLineId());
+        KrBRegionProvince province = krBRegionProvinceMapper.selectById(line.getProvinceId());
+        String basePath = UploadConfig.powerPath +
+                province.getName() + UploadConfig.SEPARATOR +
+                line.getLineName();
+
+        String secBasePath;
+        String thirdBasePath;
+        List<BFile> sonList;
+        // 获取3杆塔图纸
+        String shape = tower.getTowerNumber();
+        int lastIndex = shape.lastIndexOf('-');
+        if (lastIndex > 0) {
+            shape = shape.substring(0, lastIndex).replace('/', ' ');
+        }
+        if (StringUtils.isNotBlank(shape)) {
+            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), auth);
+            thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, auth);
+            sonList = MyFileUtils.getSubBFiles(thirdBasePath, auth);
+        } else {
+            sonList = Lists.newArrayList();
+        }
+        resultMap.put("shapeFileList", sonList);
+
+        // 获取6地线金具串图
+        secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), auth);
+        String hardwareType = tower.getHardwareType().replace('/', ' ');
+        if (StringUtils.isNotBlank(hardwareType)) {
+            FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareType) || (name.startsWith(UploadConfig.AUTH_STR + hardwareType) && auth);
+            sonList = MyFileUtils.getSubBFiles(secBasePath, hardwareTypeFilter, auth);
+        } else {
+            sonList = Lists.newArrayList();
+        }
+        resultMap.put("hardwareFileList", sonList);
+
+        // 获取7班组巡检照片
+        secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TEAM_CHECK_PIC.getName(), auth);
+        String towerName = tower.getTowerName();
+        thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, towerName, auth);
+        sonList = MyFileUtils.getSubBFiles(thirdBasePath, auth);
+        resultMap.put("teamCheckFileList", sonList);
+
+        return resultMap;
+    }
+
+    @Override
+    public void setHasFile(List<KrBTower> towerList) {
+        AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        setHasFile(towerList, userDetails);
+    }
+
+    @Override
+    public void setHasFile(List<KrBTower> towerList, AdminUserDetails userDetails) {
+        if (towerList == null || towerList.size() == 0) {
+            return;
+        }
+        boolean access = AuthUtil.checkAccess(userDetails, AuthUtil.ACCESS);
+        KrBTower firstTower = towerList.get(0);
+        KrBLine line = krBLineMapper.selectById(firstTower.getLineId());
+        KrBRegionProvince province = krBRegionProvinceMapper.selectById(line.getProvinceId());
+        String basePath = UploadConfig.powerPath +
+                province.getName() + UploadConfig.SEPARATOR +
+                line.getLineName();
+
+        for (KrBTower tower : towerList) {
+            String secBasePath;
+            String thirdBasePath;
+
+            // 检验是否包含塔形资料
+            String shape = tower.getTowerNumber();
+            if (StringUtils.isNotBlank(shape)) {
+                int lastIndex = shape.lastIndexOf('-');
+                if (lastIndex > 0) {
+                    shape = shape.substring(0, lastIndex).replace('/', ' ');
+                }
+                if (StringUtils.isNotBlank(shape)) {
+                    secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), access);
+                    thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, access);
+                    if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
+                        tower.setHasFile(1);
+                        continue;
+                    }
+                }
+            }
+
+            // 检验是否含有金具串资料
+            String hardwareType = tower.getHardwareType();
+            if (StringUtils.isNotBlank(hardwareType)) {
+                secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), access);
+                String hardwareTypeReplace = hardwareType.replace('/', ' ');
+                FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareTypeReplace) || (name.startsWith(UploadConfig.AUTH_STR + hardwareTypeReplace) && access);
+                if (MyFileUtils.hasSonFile(secBasePath, hardwareTypeFilter, access)) {
+                    tower.setHasFile(1);
+                    continue;
+                }
+            }
+
+            // 检验是否含有巡检照片
+            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TEAM_CHECK_PIC.getName(), access);
+            thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, tower.getTowerName(), access);
+            if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
+                tower.setHasFile(1);
+                continue;
+            }
+
+
+            tower.setHasFile(0);
+        }
+
+        krBTowerMapper.saveAndUpdate(towerList);
+    }
+
 }

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

@@ -1,78 +1,78 @@
-<?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.BLineMapper">
+<!--<?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.BLineMapper">-->
 
-    <select id="findListMulti" resultMap="BaseResultMap">
-        SELECT l.id,
-               l.name,
-               l.province_id,
-               p.province,
-               l.creator_id,
-               l.create_time,
-               t.id            t_id,
-               t.sort          t_sort,
-               t.name          t_name,
-               t.shape         t_shape,
-               t.hardware_type t_hardware_type,
-               t.line_id       t_line_id,
-               t.lon           t_lon,
-               t.lat           t_lat,
-               t.has_file      t_has_file,
-               t.create_time   t_create_time
-        FROM b_line l
-                 LEFT JOIN b_province p ON l.province_id = p.id
-                 LEFT JOIN b_tower t ON l.id = t.line_id
-        ORDER BY t_sort;
-    </select>
+<!--    <select id="findListMulti" resultMap="BaseResultMap">-->
+<!--        SELECT l.id,-->
+<!--               l.name,-->
+<!--               l.province_id,-->
+<!--               p.province,-->
+<!--               l.creator_id,-->
+<!--               l.create_time,-->
+<!--               t.id            t_id,-->
+<!--               t.sort          t_sort,-->
+<!--               t.name          t_name,-->
+<!--               t.shape         t_shape,-->
+<!--               t.hardware_type t_hardware_type,-->
+<!--               t.line_id       t_line_id,-->
+<!--               t.lon           t_lon,-->
+<!--               t.lat           t_lat,-->
+<!--               t.has_file      t_has_file,-->
+<!--               t.create_time   t_create_time-->
+<!--        FROM b_line l-->
+<!--                 LEFT JOIN b_province p ON l.province_id = p.id-->
+<!--                 LEFT JOIN b_tower t ON l.id = t.line_id-->
+<!--        ORDER BY t_sort;-->
+<!--    </select>-->
 
-    <select id="findListByKey" resultMap="BaseResultMap" parameterType="string">
-        SELECT l.id,
-               l.name,
-               l.province_id,
-               p.province,
-               l.creator_id,
-               l.create_time,
-               t.id            t_id,
-               t.sort          t_sort,
-               t.name          t_name,
-               t.shape         t_shape,
-               t.hardware_type t_hardware_type,
-               t.line_id       t_line_id,
-               t.lon           t_lon,
-               t.lat           t_lat,
-               t.has_file      t_has_file,
-               t.create_time   t_crete_time
-        FROM b_line l
-                 LEFT JOIN b_tower t ON l.id = t.line_id
-                 LEFT JOIN b_province p on l.province_id = p.id
-        WHERE l.name like concat('%', #{key}, '%')
-           OR p.province like concat('%', #{key}, '%')
-           OR t.shape like concat('%', #{key}, '%')
-        ORDER BY t_sort;
+<!--    <select id="findListByKey" resultMap="BaseResultMap" parameterType="string">-->
+<!--        SELECT l.id,-->
+<!--               l.name,-->
+<!--               l.province_id,-->
+<!--               p.province,-->
+<!--               l.creator_id,-->
+<!--               l.create_time,-->
+<!--               t.id            t_id,-->
+<!--               t.sort          t_sort,-->
+<!--               t.name          t_name,-->
+<!--               t.shape         t_shape,-->
+<!--               t.hardware_type t_hardware_type,-->
+<!--               t.line_id       t_line_id,-->
+<!--               t.lon           t_lon,-->
+<!--               t.lat           t_lat,-->
+<!--               t.has_file      t_has_file,-->
+<!--               t.create_time   t_crete_time-->
+<!--        FROM b_line l-->
+<!--                 LEFT JOIN b_tower t ON l.id = t.line_id-->
+<!--                 LEFT JOIN b_province p on l.province_id = p.id-->
+<!--        WHERE l.name like concat('%', #{key}, '%')-->
+<!--           OR p.province like concat('%', #{key}, '%')-->
+<!--           OR t.shape like concat('%', #{key}, '%')-->
+<!--        ORDER BY t_sort;-->
 
-    </select>
+<!--    </select>-->
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BLine">
-        <id column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="province_id" property="provinceId"/>
-        <result column="province" property="province"/>
-        <result column="creator_id" property="creatorId"/>
-        <result column="create_time" property="createTime"/>
-        <collection property="towerList" ofType="com.macro.mall.tiny.modules.business.model.BTower" column="id">
-            <id column="t_id" property="id"/>
-            <result column="t_sort" property="sort"/>
-            <result column="t_name" property="name"/>
-            <result column="t_shape" property="shape"/>
-            <result column="t_hardware_type" property="hardwareType"/>
-            <result column="t_line_id" property="lineId"/>
-            <result column="t_line_id" property="lineId"/>
-            <result column="t_lon" property="lon"/>
-            <result column="t_lat" property="lat"/>
-            <result column="t_has_file" property="hasFile"/>
-            <result column="t_create_time" property="createTime"/>
-        </collection>
-    </resultMap>
+<!--    &lt;!&ndash; 通用查询映射结果 &ndash;&gt;-->
+<!--    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BLine">-->
+<!--        <id column="id" property="id"/>-->
+<!--        <result column="name" property="name"/>-->
+<!--        <result column="province_id" property="provinceId"/>-->
+<!--        <result column="province" property="province"/>-->
+<!--        <result column="creator_id" property="creatorId"/>-->
+<!--        <result column="create_time" property="createTime"/>-->
+<!--        <collection property="towerList" ofType="com.macro.mall.tiny.modules.business.model.BTower" column="id">-->
+<!--            <id column="t_id" property="id"/>-->
+<!--            <result column="t_sort" property="sort"/>-->
+<!--            <result column="t_name" property="name"/>-->
+<!--            <result column="t_shape" property="shape"/>-->
+<!--            <result column="t_hardware_type" property="hardwareType"/>-->
+<!--            <result column="t_line_id" property="lineId"/>-->
+<!--            <result column="t_line_id" property="lineId"/>-->
+<!--            <result column="t_lon" property="lon"/>-->
+<!--            <result column="t_lat" property="lat"/>-->
+<!--            <result column="t_has_file" property="hasFile"/>-->
+<!--            <result column="t_create_time" property="createTime"/>-->
+<!--        </collection>-->
+<!--    </resultMap>-->
 
-</mapper>
+<!--</mapper>-->

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

@@ -18,7 +18,7 @@
     </select>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BLineUploadLog">
+    <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" />
@@ -28,7 +28,7 @@
     </resultMap>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap2" type="com.macro.mall.tiny.modules.business.model.BLineUploadLog">
+    <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" />

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

@@ -1,11 +1,11 @@
-<?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.BProvinceMapper">
+<!--<?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.BProvinceMapper">-->
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BProvince">
-        <id column="id" property="id" />
-        <result column="province" property="province" />
-    </resultMap>
+<!--    &lt;!&ndash; 通用查询映射结果 &ndash;&gt;-->
+<!--    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BProvince">-->
+<!--        <id column="id" property="id" />-->
+<!--        <result column="province" property="province" />-->
+<!--    </resultMap>-->
 
-</mapper>
+<!--</mapper>-->

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

@@ -1,56 +1,56 @@
-<?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.BTowerMapper">
+<!--<?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.BTowerMapper">-->
 
-    <insert id="saveAndUpdate" parameterType="list">
-        INSERT INTO b_tower (
-        sort,
-        name,
-        shape,
-        hardware_type,
-        line_id,
-        lon,
-        lat,
-        has_file,
-        create_time
-        )
-        VALUES
-        <foreach collection="towerList" item="item" separator=",">
-            (
-            #{item.sort},
-            #{item.name},
-            #{item.shape},
-            #{item.hardwareType},
-            #{item.lineId},
-            #{item.lon},
-            #{item.lat},
-            #{item.hasFile},
-            #{item.createTime}
-            )
-        </foreach>
-        ON DUPLICATE KEY UPDATE
-        sort = VALUES(sort),
-        shape = VALUES(shape),
-        hardware_type = VALUES(hardware_type),
-        lon = VALUES(lon),
-        lat = VALUES(lat),
-        has_file = VALUES(has_file),
-        create_time = VALUES(create_time);
+<!--    <insert id="saveAndUpdate" parameterType="list">-->
+<!--        INSERT INTO b_tower (-->
+<!--        sort,-->
+<!--        name,-->
+<!--        shape,-->
+<!--        hardware_type,-->
+<!--        line_id,-->
+<!--        lon,-->
+<!--        lat,-->
+<!--        has_file,-->
+<!--        create_time-->
+<!--        )-->
+<!--        VALUES-->
+<!--        <foreach collection="towerList" item="item" separator=",">-->
+<!--            (-->
+<!--            #{item.sort},-->
+<!--            #{item.name},-->
+<!--            #{item.shape},-->
+<!--            #{item.hardwareType},-->
+<!--            #{item.lineId},-->
+<!--            #{item.lon},-->
+<!--            #{item.lat},-->
+<!--            #{item.hasFile},-->
+<!--            #{item.createTime}-->
+<!--            )-->
+<!--        </foreach>-->
+<!--        ON DUPLICATE KEY UPDATE-->
+<!--        sort = VALUES(sort),-->
+<!--        shape = VALUES(shape),-->
+<!--        hardware_type = VALUES(hardware_type),-->
+<!--        lon = VALUES(lon),-->
+<!--        lat = VALUES(lat),-->
+<!--        has_file = VALUES(has_file),-->
+<!--        create_time = VALUES(create_time);-->
 
-    </insert>
+<!--    </insert>-->
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BTower">
-        <id column="id" property="id"/>
-        <result column="sort" property="sort"/>
-        <result column="name" property="name"/>
-        <result column="shape" property="shape"/>
-        <result column="hardware_type" property="hardwareType"/>
-        <result column="line_id" property="lineId"/>
-        <result column="lon" property="lon"/>
-        <result column="lat" property="lat"/>
-        <result column="has_file" property="hasFile"/>
-        <result column="create_time" property="createTime"/>
-    </resultMap>
+<!--    &lt;!&ndash; 通用查询映射结果 &ndash;&gt;-->
+<!--    <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BTower">-->
+<!--        <id column="id" property="id"/>-->
+<!--        <result column="sort" property="sort"/>-->
+<!--        <result column="name" property="name"/>-->
+<!--        <result column="shape" property="shape"/>-->
+<!--        <result column="hardware_type" property="hardwareType"/>-->
+<!--        <result column="line_id" property="lineId"/>-->
+<!--        <result column="lon" property="lon"/>-->
+<!--        <result column="lat" property="lat"/>-->
+<!--        <result column="has_file" property="hasFile"/>-->
+<!--        <result column="create_time" property="createTime"/>-->
+<!--    </resultMap>-->
 
-</mapper>
+<!--</mapper>-->

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

@@ -4,18 +4,30 @@
 
     <insert id="saveAndUpdate" parameterType="list">
         INSERT INTO kr_b_tower (
-        sort,
-        name,
-        shape,
-        hardware_type,
         line_id,
-        lon,
-        lat,
+        tower_index,
+        tower_name,
+        tower_number,
+        hardware_type,
+        longitude,
+        latitude,
+        type,
+        is_station,
+        is_weather,
+        circuit,
+        height,
+        practical_height,
+        corner_direction,
+        corner_number,
+        span,
+        servuce_begintime,
+        remark,
         has_file,
+        creator_id,
         create_time
         )
         VALUES
-        <foreach collection="towerList" item="item" separator=",">
+        <foreach collection="krBTowerList" item="item" separator=",">
             (
             #{item.lineId},
             #{item.towerIndex},
@@ -49,36 +61,46 @@
         type = VALUES(type),
         is_station = VALUES(is_station),
         is_weather = VALUES(is_weather),
-        lat = VALUES(lat),
+        circuit = VALUES(circuit),
+        height = VALUES(height),
+        practical_height = VALUES(practical_height),
+        corner_direction = VALUES(corner_direction),
+        corner_number = VALUES(corner_number),
+        span = VALUES(span),
+        span = VALUES(span),
+        servuce_begintime = VALUES(servuce_begintime),
+        remark = VALUES(remark),
+        remark = VALUES(remark),
         has_file = VALUES(has_file),
+        creator_id = VALUES(creator_id),
         create_time = VALUES(create_time);
 
     </insert>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.KrBTower">
-        <id column="id" property="id" />
-        <result column="line_id" property="lineId" />
-        <result column="tower_index" property="towerIndex" />
-        <result column="tower_name" property="towerName" />
-        <result column="tower_number" property="towerNumber" />
-        <result column="hardware_type" property="hardwareType" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="type" property="type" />
-        <result column="is_station" property="isStation" />
-        <result column="is_weather" property="isWeather" />
-        <result column="circuit" property="circuit" />
-        <result column="height" property="height" />
-        <result column="practical_height" property="practicalHeight" />
-        <result column="corner_direction" property="cornerDirection" />
-        <result column="corner_number" property="cornerNumber" />
-        <result column="span" property="span" />
-        <result column="servuce_begintime" property="servuceBegintime" />
-        <result column="remark" property="remark" />
-        <result column="has_file" property="hasFile" />
-        <result column="creator_id" property="creatorId" />
-        <result column="create_time" property="createTime" />
+        <id column="id" property="id"/>
+        <result column="line_id" property="lineId"/>
+        <result column="tower_index" property="towerIndex"/>
+        <result column="tower_name" property="towerName"/>
+        <result column="tower_number" property="towerNumber"/>
+        <result column="hardware_type" property="hardwareType"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="type" property="type"/>
+        <result column="is_station" property="isStation"/>
+        <result column="is_weather" property="isWeather"/>
+        <result column="circuit" property="circuit"/>
+        <result column="height" property="height"/>
+        <result column="practical_height" property="practicalHeight"/>
+        <result column="corner_direction" property="cornerDirection"/>
+        <result column="corner_number" property="cornerNumber"/>
+        <result column="span" property="span"/>
+        <result column="servuce_begintime" property="servuceBegintime"/>
+        <result column="remark" property="remark"/>
+        <result column="has_file" property="hasFile"/>
+        <result column="creator_id" property="creatorId"/>
+        <result column="create_time" property="createTime"/>
     </resultMap>
 
 </mapper>