Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-gate/src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848,10.1.37.166:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
 ---

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/DictionaryController.java

@@ -69,3 +69,5 @@ public class DictionaryController {
         return ObjectRestResponse.succ();
     }
 }
+
+

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -5,19 +5,26 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper;
 import com.xxfc.platform.vehicle.mapper.CompanyBaseMapper;
+import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
 import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyBaseVo;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
+import com.xxfc.platform.vehicle.util.excel.ExcelImport;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -34,6 +41,9 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
      @Autowired
      BranchCompanyStockInfoMapper stockInfoMapper;
 
+     @Autowired
+    SysRegionMapper sysRegionMapper;
+
     @Value("${branchCompanyPic.url}")
     private  String companyUrl;
 
@@ -206,6 +216,57 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.getList(companyVo)));
     }
 
+    //分公司和总表同步
+    public ObjectRestResponse importExcel(MultipartFile multipartfile, HttpServletRequest request){
+        try {
+            List<String[]> readExcel = ExcelImport.getExcelData(multipartfile);
+            if(readExcel.size()<4){
+                return ObjectRestResponse.createFailedResult(1001,"导入不能没数据！！！");
+            }
+            for (int i = 3; i < readExcel.size(); i++) {
+                String[] str = readExcel.get(i);
+                String companyId = str[1];
+                String companyName = str[2];
+                String name = str[3];
+                BranchCompany branchCompany=branchCompanyBiz.selectById(companyId);
+                String provinceName=sysRegionMapper.getName(branchCompany.getAddrProvince());
+                String cityName=sysRegionMapper.getName(branchCompany.getAddrCity());
+                String townName=sysRegionMapper.getName(branchCompany.getAddrTown());
+                branchCompany.setProvinceName(provinceName);
+                branchCompany.setCityName(cityName);
+                branchCompany.setTownName(townName);
+                CompanyBase companyBase=new CompanyBase();
+                companyBase.setName(name);
+                companyBase=selectOne(companyBase);
+                Integer companyBaseId=0;
+                if (companyBase==null){
+                    companyBase=new CompanyBase();
+                    BeanUtils.copyProperties(branchCompany,companyBase);
+                    companyBase.setId(null);
+                    companyBase.setName(name);
+                    insertSelective(companyBase);
+                    companyBaseId=companyBase.getId();
+                }else {
+                    companyBaseId=companyBase.getId();
+                    companyBase.setZoneId(branchCompany.getZoneId());
+                    companyBase.setAddrProvince(branchCompany.getAddrProvince());
+                    companyBase.setProvinceName(provinceName);
+                    companyBase.setAddrCity(branchCompany.getAddrCity());
+                    companyBase.setCityName(cityName);
+                    companyBase.setAddrTown(branchCompany.getAddrTown());
+                    companyBase.setTownName(townName);
+                    updateSelectiveById(companyBase);
+                }
+                branchCompany.setCompanyBaseId(companyBaseId);
+                branchCompanyBiz.updateSelectiveById(branchCompany);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(10001,"网络异常！");
+        }
+        return ObjectRestResponse.succ();
+    }
+
     
 
     public CompanyBaseVo findCompanyDetailById(Integer id) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/SysRegionMapper.java

@@ -17,4 +17,7 @@ public interface SysRegionMapper extends Mapper<SysRegion> {
    public Integer getNumber(@Param("name") String name);
    //获取地区的编号
    public Integer getNumberV2(@Param("name") String name, @Param("type") Integer type);
+
+   //获取地区的编号
+   public String getName(@Param("code") Integer code);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java

@@ -3,19 +3,10 @@ package com.xxfc.platform.vehicle.rest.admin;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.xxfc.platform.vehicle.biz.BranchCompanyStockApplyInfoBiz;
 import com.xxfc.platform.vehicle.biz.CompanyBaseBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo;
-import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyVo;
-import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
-import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyStockInfoRightVo;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -76,6 +67,18 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
         return  baseBiz.delCompany(id);
     }
 
+    /**
+     * 导入
+     * @param multipartfile
+     * @param request
+     * @return
+     */
+    @PostMapping("app/unauth/importExcel")
+    public ObjectRestResponse importExcel(@RequestParam(value = "file") MultipartFile multipartfile,
+                                    HttpServletRequest request) {
+        return baseBiz.importExcel(multipartfile,request);
+    }
+
 
 
 

xx-vehicle/xx-vehicle-server/src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848,10.1.37.166:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/SysRegionMapper.xml

@@ -18,6 +18,10 @@
     <select id="getNumber" resultType="Integer">
         select `id` from sys_region  where  name  like  CONCAT('%',#{name},'%') limit 1
     </select>
+
+    <select id="getName" resultType="String">
+        select `name` from sys_region  where  id=#{code}
+    </select>
     <select id="getNumberV2" resultType="Integer">
         select `id` from sys_region  where  name  like  CONCAT('%',#{name},'%') and type=#{type} limit 1
     </select>