From 970bb972de8fb73f7dedbf473f91181f5d880333 Mon Sep 17 00:00:00 2001 From: yxt_njy <119782786@qq.com> Date: Sun, 29 Jan 2023 18:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E6=A8=A1=E5=9D=97=E6=A1=86?= =?UTF-8?q?=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervise/rms/biz/loan/LoanMapper.java | 3 +- .../com/supervise/rms/biz/loan/LoanMapper.xml | 2 +- .../com/supervise/rms/biz/loan/LoanRest.java | 6 +- .../supervise/rms/biz/loan/LoanService.java | 4 +- .../biz/loansupplier/LoanSupplierMapper.java | 3 +- .../biz/loansupplier/LoanSupplierMapper.xml | 2 +- .../biz/loansupplier/LoanSupplierRest.java | 6 +- .../biz/loansupplier/LoanSupplierService.java | 3 +- .../LoanSupplierOrderMapper.java | 3 +- .../LoanSupplierOrderMapper.xml | 2 +- .../LoanSupplierOrderRest.java | 4 +- .../LoanSupplierOrderService.java | 3 +- .../restrictedbrand/RestrictedBrandRest.java | 1 + .../RestrictedCategoryService.java | 297 +++++++++--------- 14 files changed, 169 insertions(+), 170 deletions(-) diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.java index dc8173e1..d0c3091e 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.java @@ -25,11 +25,12 @@ *********************************************************/ package com.supervise.rms.biz.loan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervise.rms.api.loan.Loan; import com.supervise.rms.api.risk.Risk; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface LoanMapper extends BaseMapper { +public interface LoanMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.xml index a3c8532b..7cb7d87a 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanRest.java index 2f5b1e40..941a73c3 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanRest.java @@ -5,9 +5,9 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.risk.RiskRest") -@RequestMapping("v1/risk") +@Api(tags = "贷款表") +@RestController("com.supervise.rmc.biz.loan.LoanRest") +@RequestMapping("v1/loan") public class LoanRest implements RiskFeign { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanService.java index cfac66d6..dbe8b21b 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loan/LoanService.java @@ -1,11 +1,11 @@ package com.supervise.rms.biz.loan; -import com.supervise.rms.api.risk.Risk; +import com.supervise.rms.api.loan.Loan; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; @Service -public class LoanService extends MybatisBaseService { +public class LoanService extends MybatisBaseService { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.java index f8bcc306..48835c37 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.java @@ -25,11 +25,12 @@ *********************************************************/ package com.supervise.rms.biz.loansupplier; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervise.rms.api.loansupplier.LoanSupplier; import com.supervise.rms.api.risk.Risk; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface LoanSupplierMapper extends BaseMapper { +public interface LoanSupplierMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.xml index a3c8532b..4af02d8a 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierRest.java index dc0a874d..d4592337 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierRest.java @@ -5,9 +5,9 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.risk.RiskRest") -@RequestMapping("v1/risk") +@Api(tags = "贷款供应商对应表") +@RestController("com.supervise.rmc.biz.loansupplier.LoanSupplierRest") +@RequestMapping("v1/loanSupplier") public class LoanSupplierRest implements RiskFeign { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierService.java index 55a469bf..c194f81f 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplier/LoanSupplierService.java @@ -1,11 +1,12 @@ package com.supervise.rms.biz.loansupplier; +import com.supervise.rms.api.loansupplier.LoanSupplier; import com.supervise.rms.api.risk.Risk; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; @Service -public class LoanSupplierService extends MybatisBaseService { +public class LoanSupplierService extends MybatisBaseService { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.java index 4475a72d..46e218ab 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.java @@ -25,11 +25,12 @@ *********************************************************/ package com.supervise.rms.biz.loansupplierorder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervise.rms.api.loansupplierorder.LoanSupplierOrder; import com.supervise.rms.api.risk.Risk; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface LoanSupplierOrderMapper extends BaseMapper { +public interface LoanSupplierOrderMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.xml index a3c8532b..d0c18010 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderRest.java index 64587e3e..c8a635fd 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderRest.java @@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.risk.RiskRest") -@RequestMapping("v1/risk") +@RestController("com.supervise.rmc.biz.loansupplierorder.LoanSupplierOrderRest") +@RequestMapping("v1/loanSupplierOrder") public class LoanSupplierOrderRest implements RiskFeign { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderService.java index b3ab3947..df5aea71 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/loansupplierorder/LoanSupplierOrderService.java @@ -1,11 +1,12 @@ package com.supervise.rms.biz.loansupplierorder; +import com.supervise.rms.api.loansupplierorder.LoanSupplierOrder; import com.supervise.rms.api.risk.Risk; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; @Service -public class LoanSupplierOrderService extends MybatisBaseService { +public class LoanSupplierOrderService extends MybatisBaseService { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java index 4692648b..32a77652 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.supervise.rms.biz.restrictedbrand; +import com.supervise.rms.api.restrictedbrand.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryService.java index 7d9d1dc7..f492c6d0 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryService.java @@ -35,13 +35,6 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.portal.api.brandinfo.BrandInfoVo; -import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo; -import com.yxt.supervise.portal.api.restrictedbrand.RestrictedBrand; -import com.yxt.supervise.portal.api.restrictedcategory.*; -import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; -import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; -import com.yxt.supervise.portal.biz.restrictedbrand.RestrictedBrandService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -75,149 +68,149 @@ import java.util.Map; @Slf4j @Service public class RestrictedCategoryService extends MybatisBaseService { - @Resource - private DictCommonService dictCommonService; - @Resource - private BrandInfoService brandInfoService; - @Resource - private RestrictedBrandService restrictedBrandService; - private QueryWrapper createQueryWrapper(RestrictedCategoryQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - RestrictedCategoryQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(RestrictedCategoryDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(RestrictedCategoryDto dto){ - RestrictedCategory entity = new RestrictedCategory(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(RestrictedCategoryDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - RestrictedCategory entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public RestrictedCategoryDetailsVo fetchDetailsVoBySid(String sid){ - RestrictedCategory entity = fetchBySid(sid); - RestrictedCategoryDetailsVo vo = new RestrictedCategoryDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public void readBrandPeriodSorXls1(InputStream is, String sid) { - HSSFWorkbook hssfWorkbook = null; - try { - hssfWorkbook = new HSSFWorkbook(is); - } catch (IOException e) { - e.printStackTrace(); - } - - List lisss=new ArrayList<>(); - List lisss2=new ArrayList<>(); - HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0); - - // 循环行Row - for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) { - RestrictedCategory pr=new RestrictedCategory(); - HSSFRow hssfRow = hssfSheet.getRow(rowNum); - int i = 0; - try{ - if(rowNum>=1){ - for ( ; i < hssfRow.getLastCellNum(); i++) { - HSSFCell brandIdHSSFCell = hssfRow.getCell(i); - if(brandIdHSSFCell!=null){ - if (i == 1) {//编码 - brandIdHSSFCell.setCellType(CellType.STRING); - if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) { - String value = brandIdHSSFCell.getStringCellValue(); - pr.setCategorys(value); - } - } - /*if (i == 2) {//名称 - brandIdHSSFCell.setCellType(CellType.STRING); - if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) { - String value = brandIdHSSFCell.getStringCellValue(); - pr.setBrands(value); - } - }*/ - }else{ - System.err.println("rowNum="+rowNum+",i="+i+",value=null"); - } - } - } - }catch(Exception e){ - e.printStackTrace(); - System.err.println("i="+i+",value=null"); - } - - lisss.add(rowNum+""); - baseMapper.insert(pr); - log.info("productInformation:{}", JSONObject.toJSONString(pr)); - } - String x = JSON.toJSONString(lisss); - System.out.println(x); - String x1 = JSON.toJSONString(lisss2); - System.out.println(x1); - //return message; - } - - /** - * 商品限制判断 - * @param categoryKey 品类键值 - * @param brandCode 品牌代码 - * @return ResultBean - * 2022/4/28 聂金毅 修改 - */ - public Map limitJudgement(String categoryKey, String brandCode) { - Map result=new HashMap<>(); - RestrictedCategory r=baseMapper.selectByCategorys(categoryKey); - result.put("success","1"); - String msg=""; - if(r==null ){ - result.put("success","0"); - DictCommonDetailsVo category = dictCommonService.fetchByKeyAndType(categoryKey, "category"); - if(category==null){ - msg=msg+categoryKey+"商品品类不存在;"; - }else{ - msg=msg+category.getDictValue()+"["+categoryKey+"]"+"不符合监管品类;"; - } - } - RestrictedBrand r1=restrictedBrandService.selectByBrands(brandCode); - if(r1==null ){ - result.put("success","0"); - BrandInfoVo brandInfoVo = brandInfoService.selectByCode(brandCode); - if(brandInfoVo==null){ - msg=msg+categoryKey+"商品品牌不存在;"; - }else{ - msg=msg+brandInfoVo.getName()+"["+brandCode+"]"+"不符合监管品牌;"; - } - } - result.put("msg",msg); - return result; - } +// @Resource +// private DictCommonService dictCommonService; +// @Resource +// private BrandInfoService brandInfoService; +// @Resource +// private RestrictedBrandService restrictedBrandService; +// private QueryWrapper createQueryWrapper(RestrictedCategoryQuery query) { +// // todo: 这里根据具体业务调整查询条件 +// // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); +// QueryWrapper qw = new QueryWrapper<>(); +// return qw; +// } +// +// public PagerVo listPageVo(PagerQuery pq) { +// RestrictedCategoryQuery query = pq.getParams(); +// QueryWrapper qw = createQueryWrapper(query); +// IPage page = PagerUtil.queryToPage(pq); +// IPage pagging = baseMapper.selectPageVo(page, qw); +// PagerVo p = PagerUtil.pageToVo(pagging, null); +// return p; +// } +// +// public void saveOrUpdateDto(RestrictedCategoryDto dto){ +// String dtoSid = dto.getSid(); +// if (StringUtils.isBlank(dtoSid)) { +// this.insertByDto(dto); +// return; +// } +// this.updateByDto(dto); +// } +// +// public void insertByDto(RestrictedCategoryDto dto){ +// RestrictedCategory entity = new RestrictedCategory(); +// BeanUtil.copyProperties(dto, entity, "id", "sid"); +// baseMapper.insert(entity); +// } +// +// public void updateByDto(RestrictedCategoryDto dto){ +// String dtoSid = dto.getSid(); +// if (StringUtils.isBlank(dtoSid)) { +// return; +// } +// RestrictedCategory entity = fetchBySid(dtoSid); +// BeanUtil.copyProperties(dto, entity, "id", "sid"); +// baseMapper.updateById(entity); +// } +// +// public RestrictedCategoryDetailsVo fetchDetailsVoBySid(String sid){ +// RestrictedCategory entity = fetchBySid(sid); +// RestrictedCategoryDetailsVo vo = new RestrictedCategoryDetailsVo(); +// BeanUtil.copyProperties(entity, vo); +// return vo; +// } +// +// public void readBrandPeriodSorXls1(InputStream is, String sid) { +// HSSFWorkbook hssfWorkbook = null; +// try { +// hssfWorkbook = new HSSFWorkbook(is); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// +// List lisss=new ArrayList<>(); +// List lisss2=new ArrayList<>(); +// HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0); +// +// // 循环行Row +// for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) { +// RestrictedCategory pr=new RestrictedCategory(); +// HSSFRow hssfRow = hssfSheet.getRow(rowNum); +// int i = 0; +// try{ +// if(rowNum>=1){ +// for ( ; i < hssfRow.getLastCellNum(); i++) { +// HSSFCell brandIdHSSFCell = hssfRow.getCell(i); +// if(brandIdHSSFCell!=null){ +// if (i == 1) {//编码 +// brandIdHSSFCell.setCellType(CellType.STRING); +// if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) { +// String value = brandIdHSSFCell.getStringCellValue(); +// pr.setCategorys(value); +// } +// } +// /*if (i == 2) {//名称 +// brandIdHSSFCell.setCellType(CellType.STRING); +// if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) { +// String value = brandIdHSSFCell.getStringCellValue(); +// pr.setBrands(value); +// } +// }*/ +// }else{ +// System.err.println("rowNum="+rowNum+",i="+i+",value=null"); +// } +// } +// } +// }catch(Exception e){ +// e.printStackTrace(); +// System.err.println("i="+i+",value=null"); +// } +// +// lisss.add(rowNum+""); +// baseMapper.insert(pr); +// log.info("productInformation:{}", JSONObject.toJSONString(pr)); +// } +// String x = JSON.toJSONString(lisss); +// System.out.println(x); +// String x1 = JSON.toJSONString(lisss2); +// System.out.println(x1); +// //return message; +// } +// +// /** +// * 商品限制判断 +// * @param categoryKey 品类键值 +// * @param brandCode 品牌代码 +// * @return ResultBean +// * 2022/4/28 聂金毅 修改 +// */ +// public Map limitJudgement(String categoryKey, String brandCode) { +// Map result=new HashMap<>(); +// RestrictedCategory r=baseMapper.selectByCategorys(categoryKey); +// result.put("success","1"); +// String msg=""; +// if(r==null ){ +// result.put("success","0"); +// DictCommonDetailsVo category = dictCommonService.fetchByKeyAndType(categoryKey, "category"); +// if(category==null){ +// msg=msg+categoryKey+"商品品类不存在;"; +// }else{ +// msg=msg+category.getDictValue()+"["+categoryKey+"]"+"不符合监管品类;"; +// } +// } +// RestrictedBrand r1=restrictedBrandService.selectByBrands(brandCode); +// if(r1==null ){ +// result.put("success","0"); +// BrandInfoVo brandInfoVo = brandInfoService.selectByCode(brandCode); +// if(brandInfoVo==null){ +// msg=msg+categoryKey+"商品品牌不存在;"; +// }else{ +// msg=msg+brandInfoVo.getName()+"["+brandCode+"]"+"不符合监管品牌;"; +// } +// } +// result.put("msg",msg); +// return result; +// } } \ No newline at end of file