PI-11-HS CODE接口-01：

接口调整
新增HS CODE通用模糊查询接口，增加监管条件字段。
mt
2023年2月24日18:02:22

@@ -25,7 +25,8 @@ public enum ErrorCodeEnum {
     ERROR_30101("30101","数据查询异常（访问数据库超时或者其他数据库异常）"),
     ERROR_30101("30101","数据查询异常（访问数据库超时或者其他数据库异常）"),
     ERROR_30102("30102","hscode编码字段长度超过2000字符"),
     ERROR_30102("30102","hscode编码字段长度超过2000字符"),
     ERROR_30103("30103","skuCode与skuName必须传递一项"),
     ERROR_30103("30103","skuCode与skuName必须传递一项"),
-    ERROR_30104("30104","skuCode或skuName长度超出限制");
+    ERROR_30104("30104","skuCode或skuName长度超出限制"),
+    ERROR_30105("30105","skuCode编码最少输入4位字符，skuName最少输入2个字符");
 
 
     ErrorCodeEnum(String code,String name){
     ErrorCodeEnum(String code,String name){
         this.code = code;
         this.code = code;

@@ -98,12 +98,12 @@ public class HsCodeInterface {
             long end = System.currentTimeMillis();
             long end = System.currentTimeMillis();
             iclearApiHsCodeLog.setSpendTime(end-begin);
             iclearApiHsCodeLog.setSpendTime(end-begin);
             String skuCode = hscode.getSkuCode();
             String skuCode = hscode.getSkuCode();
-            if(!StringUtil.isEmpty(skuCode)){
+            if(!StringUtil.isEmpty(skuCode) && skuCode.length() > 50){
                 skuCode = skuCode.substring(0,50);
                 skuCode = skuCode.substring(0,50);
             }
             }
             String skuName = hscode.getSkuName();
             String skuName = hscode.getSkuName();
-            if(!StringUtil.isEmpty(skuName)){
-                skuName = skuName.substring(0,50);
+            if(!StringUtil.isEmpty(skuName) && skuName.length() > 1000){
+                skuName = skuName.substring(0,1000);
             }
             }
             iclearApiHsCodeLog.setCode("[skuCode="+skuCode+"],[skuName="+skuName+"]");
             iclearApiHsCodeLog.setCode("[skuCode="+skuCode+"],[skuName="+skuName+"]");
             iClearApiHsCodeLogService.saveIClearApiHsCodeLog(iclearApiHsCodeLog);
             iClearApiHsCodeLogService.saveIClearApiHsCodeLog(iclearApiHsCodeLog);

@@ -94,5 +94,8 @@ public class Constant {
 
 
     public static String DECLARED_DOC_TYPE_ZERO="declaredDocType_00";
     public static String DECLARED_DOC_TYPE_ZERO="declaredDocType_00";
 
 
-
+    /**
+     * 监管条件
+     */
+    public static final String supervise_condition = "superviseRestrict";
 }
 }

@@ -2,6 +2,8 @@ package com.erry.iclear.dateInterface.entity;
 
 
 import com.erry.iclear.dateInterface.common.BaseModel;
 import com.erry.iclear.dateInterface.common.BaseModel;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import org.hibernate.annotations.Persister;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -13,6 +15,7 @@ import java.util.Date;
  */
  */
 @Entity
 @Entity
 @Table(name = "T_CC_HS_CODE")
 @Table(name = "T_CC_HS_CODE")
+@Data
 public class HsCode extends BaseModel {
 public class HsCode extends BaseModel {
 
 
     private static final long serialVersionUID = 2693103610036977383L;
     private static final long serialVersionUID = 2693103610036977383L;
@@ -449,820 +452,14 @@ public class HsCode extends BaseModel {
     @Column(name = "OUT_RATE")
     @Column(name = "OUT_RATE")
     private BigDecimal outRate;
     private BigDecimal outRate;
 
 
+    /**
+     * 是否限制出口C类申报
+     * 1表示限制，0表示不限制
+     */
+    @Transient
+    Integer restrictedC;
 
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    @Override
-    public Long getId() {
-        return id;
-    }
-
-    @Override
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getSkuCode() {
-        return skuCode;
-    }
-
-    public void setSkuCode(String skuCode) {
-        this.skuCode = skuCode;
-    }
-
-    public String getSkuName() {
-        return skuName;
-    }
-
-    public void setSkuName(String skuName) {
-        this.skuName = skuName;
-    }
-
-    public BigDecimal getDutyRate() {
-        return dutyRate;
-    }
-
-    public void setDutyRate(BigDecimal dutyRate) {
-        this.dutyRate = dutyRate;
-    }
-
-    public BigDecimal getRegRate() {
-        return regRate;
-    }
-
-    public void setRegRate(BigDecimal regRate) {
-        this.regRate = regRate;
-    }
-
-    public BigDecimal getTaxRate() {
-        return taxRate;
-    }
-
-    public void setTaxRate(BigDecimal taxRate) {
-        this.taxRate = taxRate;
-    }
-
-    public String getMeasureUnit() {
-        return measureUnit;
-    }
-
-    public void setMeasureUnit(String measureUnit) {
-        this.measureUnit = measureUnit;
-    }
-
-    public String getMonitorCondition() {
-        return monitorCondition;
-    }
-
-    public void setMonitorCondition(String monitorCondition) {
-        this.monitorCondition = monitorCondition;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public SysUser getCreatorId() {
-        return creatorId;
-    }
-
-    public void setCreatorId(SysUser creatorId) {
-        this.creatorId = creatorId;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public SysUser getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(SysUser updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public String getUpdateUserName() {
-        return updateUserName;
-    }
-
-    public void setUpdateUserName(String updateUserName) {
-        this.updateUserName = updateUserName;
-    }
-
-    public Boolean getValidate() {
-        return validate;
-    }
-
-    public void setValidate(Boolean validate) {
-        this.validate = validate;
-    }
-
-    public String getUnitLegalFirst() {
-        return unitLegalFirst;
-    }
-
-    public void setUnitLegalFirst(String unitLegalFirst) {
-        this.unitLegalFirst = unitLegalFirst;
-    }
-
-    public String getUnitLegalSecond() {
-        return unitLegalSecond;
-    }
-
-    public void setUnitLegalSecond(String unitLegalSecond) {
-        this.unitLegalSecond = unitLegalSecond;
-    }
-
-    public Boolean getCcc() {
-        return isCcc;
-    }
-
-    public void setCcc(Boolean ccc) {
-        isCcc = ccc;
-    }
-
-    public Boolean getExporttax() {
-        return exporttax;
-    }
-
-    public void setExporttax(Boolean exporttax) {
-        this.exporttax = exporttax;
-    }
-
-    public String getElement1() {
-        return element1;
-    }
-
-    public void setElement1(String element1) {
-        this.element1 = element1;
-    }
-
-    public BigDecimal getFlag1() {
-        return flag1;
-    }
-
-    public void setFlag1(BigDecimal flag1) {
-        this.flag1 = flag1;
-    }
-
-    public String getSelect1() {
-        return select1;
-    }
-
-    public void setSelect1(String select1) {
-        this.select1 = select1;
-    }
-
-    public BigDecimal getSelectFlag1() {
-        return selectFlag1;
-    }
-
-    public void setSelectFlag1(BigDecimal selectFlag1) {
-        this.selectFlag1 = selectFlag1;
-    }
-
-    public String getElement2() {
-        return element2;
-    }
-
-    public void setElement2(String element2) {
-        this.element2 = element2;
-    }
-
-    public BigDecimal getFlag2() {
-        return flag2;
-    }
-
-    public void setFlag2(BigDecimal flag2) {
-        this.flag2 = flag2;
-    }
-
-    public String getSelect2() {
-        return select2;
-    }
-
-    public void setSelect2(String select2) {
-        this.select2 = select2;
-    }
-
-    public BigDecimal getSelectFlag2() {
-        return selectFlag2;
-    }
-
-    public void setSelectFlag2(BigDecimal selectFlag2) {
-        this.selectFlag2 = selectFlag2;
-    }
-
-    public String getElement3() {
-        return element3;
-    }
-
-    public void setElement3(String element3) {
-        this.element3 = element3;
-    }
-
-    public BigDecimal getFlag3() {
-        return flag3;
-    }
-
-    public void setFlag3(BigDecimal flag3) {
-        this.flag3 = flag3;
-    }
-
-    public String getSelect3() {
-        return select3;
-    }
-
-    public void setSelect3(String select3) {
-        this.select3 = select3;
-    }
-
-    public BigDecimal getSelectFlag3() {
-        return selectFlag3;
-    }
-
-    public void setSelectFlag3(BigDecimal selectFlag3) {
-        this.selectFlag3 = selectFlag3;
-    }
-
-    public String getElement4() {
-        return element4;
-    }
-
-    public void setElement4(String element4) {
-        this.element4 = element4;
-    }
-
-    public BigDecimal getFlag4() {
-        return flag4;
-    }
-
-    public void setFlag4(BigDecimal flag4) {
-        this.flag4 = flag4;
-    }
-
-    public String getSelect4() {
-        return select4;
-    }
-
-    public void setSelect4(String select4) {
-        this.select4 = select4;
-    }
-
-    public BigDecimal getSelectFlag4() {
-        return selectFlag4;
-    }
-
-    public void setSelectFlag4(BigDecimal selectFlag4) {
-        this.selectFlag4 = selectFlag4;
-    }
-
-    public String getElement5() {
-        return element5;
-    }
-
-    public void setElement5(String element5) {
-        this.element5 = element5;
-    }
-
-    public BigDecimal getFlag5() {
-        return flag5;
-    }
-
-    public void setFlag5(BigDecimal flag5) {
-        this.flag5 = flag5;
-    }
-
-    public String getSelect5() {
-        return select5;
-    }
-
-    public void setSelect5(String select5) {
-        this.select5 = select5;
-    }
-
-    public BigDecimal getSelectFlag5() {
-        return selectFlag5;
-    }
-
-    public void setSelectFlag5(BigDecimal selectFlag5) {
-        this.selectFlag5 = selectFlag5;
-    }
-
-    public String getElement6() {
-        return element6;
-    }
-
-    public void setElement6(String element6) {
-        this.element6 = element6;
-    }
-
-    public BigDecimal getFlag6() {
-        return flag6;
-    }
-
-    public void setFlag6(BigDecimal flag6) {
-        this.flag6 = flag6;
-    }
-
-    public String getSelect6() {
-        return select6;
-    }
-
-    public void setSelect6(String select6) {
-        this.select6 = select6;
-    }
-
-    public BigDecimal getSelectFlag6() {
-        return selectFlag6;
-    }
-
-    public void setSelectFlag6(BigDecimal selectFlag6) {
-        this.selectFlag6 = selectFlag6;
-    }
-
-    public String getElement7() {
-        return element7;
-    }
-
-    public void setElement7(String element7) {
-        this.element7 = element7;
-    }
-
-    public BigDecimal getFlag7() {
-        return flag7;
-    }
-
-    public void setFlag7(BigDecimal flag7) {
-        this.flag7 = flag7;
-    }
-
-    public String getSelect7() {
-        return select7;
-    }
-
-    public void setSelect7(String select7) {
-        this.select7 = select7;
-    }
-
-    public BigDecimal getSelectFlag7() {
-        return selectFlag7;
-    }
-
-    public void setSelectFlag7(BigDecimal selectFlag7) {
-        this.selectFlag7 = selectFlag7;
-    }
-
-    public String getElement8() {
-        return element8;
-    }
-
-    public void setElement8(String element8) {
-        this.element8 = element8;
-    }
-
-    public BigDecimal getFlag8() {
-        return flag8;
-    }
-
-    public void setFlag8(BigDecimal flag8) {
-        this.flag8 = flag8;
-    }
-
-    public String getSelect8() {
-        return select8;
-    }
-
-    public void setSelect8(String select8) {
-        this.select8 = select8;
-    }
-
-    public BigDecimal getSelectFlag8() {
-        return selectFlag8;
-    }
-
-    public void setSelectFlag8(BigDecimal selectFlag8) {
-        this.selectFlag8 = selectFlag8;
-    }
-
-    public String getElement9() {
-        return element9;
-    }
-
-    public void setElement9(String element9) {
-        this.element9 = element9;
-    }
-
-    public BigDecimal getFlag9() {
-        return flag9;
-    }
-
-    public void setFlag9(BigDecimal flag9) {
-        this.flag9 = flag9;
-    }
-
-    public String getSelect9() {
-        return select9;
-    }
-
-    public void setSelect9(String select9) {
-        this.select9 = select9;
-    }
-
-    public BigDecimal getSelectFlag9() {
-        return selectFlag9;
-    }
-
-    public void setSelectFlag9(BigDecimal selectFlag9) {
-        this.selectFlag9 = selectFlag9;
-    }
-
-    public String getElement10() {
-        return element10;
-    }
-
-    public void setElement10(String element10) {
-        this.element10 = element10;
-    }
-
-    public BigDecimal getFlag10() {
-        return flag10;
-    }
-
-    public void setFlag10(BigDecimal flag10) {
-        this.flag10 = flag10;
-    }
-
-    public String getSelect10() {
-        return select10;
-    }
-
-    public void setSelect10(String select10) {
-        this.select10 = select10;
-    }
-
-    public BigDecimal getSelectFlag10() {
-        return selectFlag10;
-    }
-
-    public void setSelectFlag10(BigDecimal selectFlag10) {
-        this.selectFlag10 = selectFlag10;
-    }
-
-    public String getElement11() {
-        return element11;
-    }
-
-    public void setElement11(String element11) {
-        this.element11 = element11;
-    }
-
-    public BigDecimal getFlag11() {
-        return flag11;
-    }
-
-    public void setFlag11(BigDecimal flag11) {
-        this.flag11 = flag11;
-    }
-
-    public String getSelect11() {
-        return select11;
-    }
-
-    public void setSelect11(String select11) {
-        this.select11 = select11;
-    }
-
-    public BigDecimal getSelectFlag11() {
-        return selectFlag11;
-    }
-
-    public void setSelectFlag11(BigDecimal selectFlag11) {
-        this.selectFlag11 = selectFlag11;
-    }
-
-    public String getElement12() {
-        return element12;
-    }
-
-    public void setElement12(String element12) {
-        this.element12 = element12;
-    }
-
-    public BigDecimal getFlag12() {
-        return flag12;
-    }
-
-    public void setFlag12(BigDecimal flag12) {
-        this.flag12 = flag12;
-    }
-
-    public String getSelect12() {
-        return select12;
-    }
-
-    public void setSelect12(String select12) {
-        this.select12 = select12;
-    }
-
-    public BigDecimal getSelectFlag12() {
-        return selectFlag12;
-    }
-
-    public void setSelectFlag12(BigDecimal selectFlag12) {
-        this.selectFlag12 = selectFlag12;
-    }
-
-    public String getElement13() {
-        return element13;
-    }
-
-    public void setElement13(String element13) {
-        this.element13 = element13;
-    }
-
-    public BigDecimal getFlag13() {
-        return flag13;
-    }
-
-    public void setFlag13(BigDecimal flag13) {
-        this.flag13 = flag13;
-    }
-
-    public String getSelect13() {
-        return select13;
-    }
-
-    public void setSelect13(String select13) {
-        this.select13 = select13;
-    }
-
-    public BigDecimal getSelectFlag13() {
-        return selectFlag13;
-    }
-
-    public void setSelectFlag13(BigDecimal selectFlag13) {
-        this.selectFlag13 = selectFlag13;
-    }
-
-    public String getElement14() {
-        return element14;
-    }
-
-    public void setElement14(String element14) {
-        this.element14 = element14;
-    }
-
-    public BigDecimal getFlag14() {
-        return flag14;
-    }
-
-    public void setFlag14(BigDecimal flag14) {
-        this.flag14 = flag14;
-    }
-
-    public String getSelect14() {
-        return select14;
-    }
-
-    public void setSelect14(String select14) {
-        this.select14 = select14;
-    }
-
-    public BigDecimal getSelectFlag14() {
-        return selectFlag14;
-    }
-
-    public void setSelectFlag14(BigDecimal selectFlag14) {
-        this.selectFlag14 = selectFlag14;
-    }
-
-    public String getElement15() {
-        return element15;
-    }
-
-    public void setElement15(String element15) {
-        this.element15 = element15;
-    }
-
-    public BigDecimal getFlag15() {
-        return flag15;
-    }
-
-    public void setFlag15(BigDecimal flag15) {
-        this.flag15 = flag15;
-    }
-
-    public String getSelect15() {
-        return select15;
-    }
-
-    public void setSelect15(String select15) {
-        this.select15 = select15;
-    }
-
-    public BigDecimal getSelectFlag15() {
-        return selectFlag15;
-    }
-
-    public void setSelectFlag15(BigDecimal selectFlag15) {
-        this.selectFlag15 = selectFlag15;
-    }
-
-    public String getElement16() {
-        return element16;
-    }
-
-    public void setElement16(String element16) {
-        this.element16 = element16;
-    }
-
-    public BigDecimal getFlag16() {
-        return flag16;
-    }
-
-    public void setFlag16(BigDecimal flag16) {
-        this.flag16 = flag16;
-    }
-
-    public String getSelect16() {
-        return select16;
-    }
-
-    public void setSelect16(String select16) {
-        this.select16 = select16;
-    }
-
-    public BigDecimal getSelectFlag16() {
-        return selectFlag16;
-    }
-
-    public void setSelectFlag16(BigDecimal selectFlag16) {
-        this.selectFlag16 = selectFlag16;
-    }
-
-    public String getElement17() {
-        return element17;
-    }
-
-    public void setElement17(String element17) {
-        this.element17 = element17;
-    }
-
-    public BigDecimal getFlag17() {
-        return flag17;
-    }
-
-    public void setFlag17(BigDecimal flag17) {
-        this.flag17 = flag17;
-    }
-
-    public String getSelect17() {
-        return select17;
-    }
-
-    public void setSelect17(String select17) {
-        this.select17 = select17;
-    }
-
-    public BigDecimal getSelectFlag17() {
-        return selectFlag17;
-    }
-
-    public void setSelectFlag17(BigDecimal selectFlag17) {
-        this.selectFlag17 = selectFlag17;
-    }
-
-    public String getElement18() {
-        return element18;
-    }
-
-    public void setElement18(String element18) {
-        this.element18 = element18;
-    }
-
-    public BigDecimal getFlag18() {
-        return flag18;
-    }
-
-    public void setFlag18(BigDecimal flag18) {
-        this.flag18 = flag18;
-    }
-
-    public String getSelect18() {
-        return select18;
-    }
-
-    public void setSelect18(String select18) {
-        this.select18 = select18;
-    }
-
-    public BigDecimal getSelectFlag18() {
-        return selectFlag18;
-    }
-
-    public void setSelectFlag18(BigDecimal selectFlag18) {
-        this.selectFlag18 = selectFlag18;
-    }
-
-    public String getElement19() {
-        return element19;
-    }
-
-    public void setElement19(String element19) {
-        this.element19 = element19;
-    }
-
-    public BigDecimal getFlag19() {
-        return flag19;
-    }
-
-    public void setFlag19(BigDecimal flag19) {
-        this.flag19 = flag19;
-    }
-
-    public String getSelect19() {
-        return select19;
-    }
-
-    public void setSelect19(String select19) {
-        this.select19 = select19;
-    }
-
-    public BigDecimal getSelectFlag19() {
-        return selectFlag19;
-    }
-
-    public void setSelectFlag19(BigDecimal selectFlag19) {
-        this.selectFlag19 = selectFlag19;
-    }
-
-    public String getElement20() {
-        return element20;
-    }
-
-    public void setElement20(String element20) {
-        this.element20 = element20;
-    }
-
-    public BigDecimal getFlag20() {
-        return flag20;
-    }
-
-    public void setFlag20(BigDecimal flag20) {
-        this.flag20 = flag20;
-    }
-
-    public String getSelect20() {
-        return select20;
-    }
-
-    public void setSelect20(String select20) {
-        this.select20 = select20;
-    }
-
-    public BigDecimal getSelectFlag20() {
-        return selectFlag20;
-    }
-
-    public void setSelectFlag20(BigDecimal selectFlag20) {
-        this.selectFlag20 = selectFlag20;
-    }
-
-    public BigDecimal getOutRate() {
-        return outRate;
-    }
 
 
-    public void setOutRate(BigDecimal outRate) {
-        this.outRate = outRate;
-    }
 
 
     @Override
     @Override
     public String toString() {
     public String toString() {

@@ -41,4 +41,13 @@ public interface DictionaryEntriesRepository  extends JpaRepository<DictionaryEn
     @Query(nativeQuery = true, value = "SELECT * FROM T_BI_DICTIONARY_ENTRIES WHERE DICT_CODE = ?1 AND EXT6 = ?2")
     @Query(nativeQuery = true, value = "SELECT * FROM T_BI_DICTIONARY_ENTRIES WHERE DICT_CODE = ?1 AND EXT6 = ?2")
     public DictionaryEntries findDictionaryEntriesByDicCode(String code,String numBer);
     public DictionaryEntries findDictionaryEntriesByDicCode(String code,String numBer);
 
 
+    /**
+     *监管条件
+     * @param dictCode
+     * @param status
+     * @return
+     */
+    @Query(nativeQuery = true, value = "select CHINESE_NAME from T_BI_DICTIONARY_ENTRIES  where DICT_CODE = ?1 AND STATUS=?2  order by ORDINAL")
+    public List<String> findDicEntByCodeList(String dictCode, Integer status);
+
 }
 }

@@ -16,27 +16,35 @@ import java.util.List;
  */
  */
 @Repository
 @Repository
 public interface HsCodeRepository extends JpaSpecificationExecutor<HsCode>, JpaRepository<HsCode, Long> {
 public interface HsCodeRepository extends JpaSpecificationExecutor<HsCode>, JpaRepository<HsCode, Long> {
-    /**
-     *
-     *  根据hscode编码查询最新一条hscode信息
-     * @param code
-     * @return
-     */
-    @Query(nativeQuery = true,value = "select top 1 * from T_CC_HS_CODE where VALIDATE=1 and SKU_CODE =?1 order by id desc ")
-    public HsCode findHsCodeByCode(String code);
 
 
     /**
     /**
      * 根据hscode编码查询对应的hscode
      * 根据hscode编码查询对应的hscode
      * @param skuCodeList
      * @param skuCodeList
      * @return
      * @return
      */
      */
-    @Query(nativeQuery = true, value = "select * from [dbo].[T_CC_HS_CODE] where VALIDATE=1 and SKU_CODE in ?1")
+    @Query(nativeQuery = true, value = "select * from T_CC_HS_CODE where VALIDATE=1 and SKU_CODE in ?1")
     List<HsCode> findHsCodeListByCode(List<String> skuCodeList);
     List<HsCode> findHsCodeListByCode(List<String> skuCodeList);
 
 
     /**
     /**
+     * 根据hscode编码或者商品名称进行模糊查询
+     * @param skuCode
+     * @param skuName
+     * @return
+     */
+    @Query(nativeQuery = true, value = "SELECT TOP 50 * FROM T_CC_HS_CODE WHERE VALIDATE=1 and SKU_CODE LIKE ?1 AND SKUNAME LIKE ?2")
+    List<HsCode> fuzzyQueryHsCode(String skuCode,String skuName);
+
+    /**
      * 查询所有有效hscode
      * 查询所有有效hscode
      * @return
      * @return
      */
      */
     @Query(nativeQuery = true,value = "select * from T_CC_HS_CODE where VALIDATE=1")
     @Query(nativeQuery = true,value = "select * from T_CC_HS_CODE where VALIDATE=1")
-    public List<HsCode> findAllHsCodeList();
+    List<HsCode> findAllHsCodeList();
+
+    /**
+     * 获取监管条件数据
+     * @return
+     */
+    @Query(nativeQuery = true,value = "select * from T_CC_HS_CODE where OUT_RATE <> 0 or MONITOR_CONDITION collate Chinese_PRC_CS_AI_WS LIKE ?1")
+    List<HsCode> findMonitorCondition(String chinsesName);
 }
 }
\ No newline at end of file

@@ -3,14 +3,17 @@ package com.erry.iclear.dateInterface.service;
 import com.erry.iclear.dateInterface.ErrorCodeEnum;
 import com.erry.iclear.dateInterface.ErrorCodeEnum;
 import com.erry.iclear.dateInterface.api.request.HsCodeParam;
 import com.erry.iclear.dateInterface.api.request.HsCodeParam;
 import com.erry.iclear.dateInterface.api.response.ResultHsCode;
 import com.erry.iclear.dateInterface.api.response.ResultHsCode;
+import com.erry.iclear.dateInterface.common.Constant;
 import com.erry.iclear.dateInterface.entity.HsCode;
 import com.erry.iclear.dateInterface.entity.HsCode;
+import com.erry.iclear.dateInterface.repository.DictionaryEntriesRepository;
 import com.erry.iclear.dateInterface.repository.HsCodeRepository;
 import com.erry.iclear.dateInterface.repository.HsCodeRepository;
 import com.erry.iclear.dateInterface.util.StringUtil;
 import com.erry.iclear.dateInterface.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import java.util.Arrays;
-import java.util.List;
+
+import java.sql.*;
+import java.util.*;
 
 
 /**
 /**
  * hscode service
  * hscode service
@@ -20,8 +23,12 @@ import java.util.List;
 @Service
 @Service
 @Slf4j
 @Slf4j
 public class HsCodeService {
 public class HsCodeService {
+
     @Autowired
     @Autowired
     HsCodeRepository hsCodeRepository;
     HsCodeRepository hsCodeRepository;
+    @Autowired
+    DictionaryEntriesRepository dicEntriesRepository;
+
     /**
     /**
      * 根据hscode编码查询对应的hscode
      * 根据hscode编码查询对应的hscode
      * @param hscode
      * @param hscode
@@ -59,6 +66,8 @@ public class HsCodeService {
                     hsCodeList.add(hsCode);
                     hsCodeList.add(hsCode);
                 }
                 }
             });
             });
+            //只能申报D类hscode监管条件hscode
+            this.setHscodeSupervise(hsCodeList);
             resultHsCode.setSuccess(Boolean.TRUE);
             resultHsCode.setSuccess(Boolean.TRUE);
             resultHsCode.setCode(ErrorCodeEnum.SUCCESS.getCode());
             resultHsCode.setCode(ErrorCodeEnum.SUCCESS.getCode());
             resultHsCode.setMsg(ErrorCodeEnum.SUCCESS.getName());
             resultHsCode.setMsg(ErrorCodeEnum.SUCCESS.getName());
@@ -80,24 +89,43 @@ public class HsCodeService {
     public ResultHsCode fuzzyQueryHsCode(HsCodeParam hscode){
     public ResultHsCode fuzzyQueryHsCode(HsCodeParam hscode){
         ResultHsCode resultHsCode = new ResultHsCode(Boolean.FALSE,"","",null);
         ResultHsCode resultHsCode = new ResultHsCode(Boolean.FALSE,"","",null);
         try{
         try{
+            //编码与品名都为空校验失败
             if(StringUtil.isEmpty(hscode.getSkuCode()) && StringUtil.isEmpty(hscode.getSkuName())){
             if(StringUtil.isEmpty(hscode.getSkuCode()) && StringUtil.isEmpty(hscode.getSkuName())){
                 resultHsCode.setCode(ErrorCodeEnum.ERROR_30103.getCode());
                 resultHsCode.setCode(ErrorCodeEnum.ERROR_30103.getCode());
                 resultHsCode.setMsg(ErrorCodeEnum.ERROR_30103.getName());
                 resultHsCode.setMsg(ErrorCodeEnum.ERROR_30103.getName());
                 return resultHsCode;
                 return resultHsCode;
             }
             }
+            //编码长度大于50校验失败
             if(!StringUtil.isEmpty(hscode.getSkuCode()) && hscode.getSkuCode().length() > 50){
             if(!StringUtil.isEmpty(hscode.getSkuCode()) && hscode.getSkuCode().length() > 50){
                 resultHsCode.setCode(ErrorCodeEnum.ERROR_30104.getCode());
                 resultHsCode.setCode(ErrorCodeEnum.ERROR_30104.getCode());
                 resultHsCode.setMsg(ErrorCodeEnum.ERROR_30104.getName());
                 resultHsCode.setMsg(ErrorCodeEnum.ERROR_30104.getName());
                 return resultHsCode;
                 return resultHsCode;
             }
             }
+            //品名长度大于1000校验失败
             if(!StringUtil.isEmpty(hscode.getSkuName()) && hscode.getSkuName().length() > 1000){
             if(!StringUtil.isEmpty(hscode.getSkuName()) && hscode.getSkuName().length() > 1000){
                 resultHsCode.setCode(ErrorCodeEnum.ERROR_30104.getCode());
                 resultHsCode.setCode(ErrorCodeEnum.ERROR_30104.getCode());
                 resultHsCode.setMsg(ErrorCodeEnum.ERROR_30104.getName());
                 resultHsCode.setMsg(ErrorCodeEnum.ERROR_30104.getName());
                 return resultHsCode;
                 return resultHsCode;
             }
             }
-            List<HsCode> hsCodeList = null;
-
-
+            //编码长度小于4位字符校验失败
+            if(!StringUtil.isEmpty(hscode.getSkuName()) && hscode.getSkuName().length() < 4){
+                resultHsCode.setCode(ErrorCodeEnum.ERROR_30105.getCode());
+                resultHsCode.setMsg(ErrorCodeEnum.ERROR_30105.getName());
+                return resultHsCode;
+            }
+            //品名长度小于2位字符校验失败
+            if(!StringUtil.isEmpty(hscode.getSkuName()) && hscode.getSkuName().length() < 2){
+                resultHsCode.setCode(ErrorCodeEnum.ERROR_30105.getCode());
+                resultHsCode.setMsg(ErrorCodeEnum.ERROR_30105.getName());
+                return resultHsCode;
+            }
+            String skuCode = "%"+hscode.getSkuCode()+"%";
+            String skuName = "%"+hscode.getSkuName()+"%";
+            //模糊查询hscode信息
+            List<HsCode> hsCodeList = this.hsCodeRepository.fuzzyQueryHsCode(skuCode,skuName);
+            //对查询数据进行处理，标志数据是否C类限制品名
+            //只能申报D类hscode监管条件hscode
+            this.setHscodeSupervise(hsCodeList);
             resultHsCode.setSuccess(Boolean.TRUE);
             resultHsCode.setSuccess(Boolean.TRUE);
             resultHsCode.setCode(ErrorCodeEnum.SUCCESS.getCode());
             resultHsCode.setCode(ErrorCodeEnum.SUCCESS.getCode());
             resultHsCode.setMsg(ErrorCodeEnum.SUCCESS.getName());
             resultHsCode.setMsg(ErrorCodeEnum.SUCCESS.getName());
@@ -131,4 +159,94 @@ public class HsCodeService {
         }
         }
         return resultHsCode;
         return resultHsCode;
     }
     }
+
+    /**
+     * 只能申报D类hscode监管条件hscode
+     * 设置hscode
+     * mt
+     * 2023年2月24日17:29:49
+     */
+    public void setHscodeSupervise(List<HsCode> hsCodeList){
+        List<Long> hsCodeIds = new ArrayList<>();
+        Map<String,Object> hscodeMap = this.getHscodeSupervise();
+        StringBuffer shsql = new StringBuffer("'");
+        if (hscodeMap !=null && hscodeMap.size()>0){
+            for (Map.Entry hscodeEntry :hscodeMap.entrySet()){
+                HsCode hsCode = (HsCode) hscodeEntry.getValue();
+                hsCodeIds.add(hsCode.getId());
+            }
+        }
+        hsCodeList.forEach(hsCode->{
+            //判断该hscode是否只能申报D类
+            if(hsCodeIds.contains(hsCode.getId())){
+                //d类
+                hsCode.setRestrictedC(1);
+            }else{
+                //C类
+                hsCode.setRestrictedC(0);
+            }
+            //如果ID为空，则设置为空
+            if(hsCode.getId() == null){
+                hsCode.setRestrictedC(null);
+            }
+        });
+    }
+
+    /**
+     * 根据监管条件获取数据，只能申报D类hscode信息
+     * mt
+     * 2023年2月24日16:43:46
+     * @return
+     */
+    private Map<String,Object> getHscodeSupervise(){
+        try {
+            Map<String,Object> returnMap = new HashMap<>();
+            List<String> dictionaryEntriesList = dicEntriesRepository.findDicEntByCodeList(Constant.supervise_condition,1);
+            if (dictionaryEntriesList !=null && dictionaryEntriesList.size()>0){
+                String chinsesName = "%[";
+                for (int i= 0;i<dictionaryEntriesList.size();i++){
+                    if (dictionaryEntriesList.size() -1 == i){
+                        chinsesName += dictionaryEntriesList.get(i)+"]%";
+                    }else{
+                        chinsesName += dictionaryEntriesList.get(i)+"|";
+                    }
+                }
+                //查询监管条件数据
+                List<HsCode> hsCodeList = this.hsCodeRepository.findMonitorCondition(chinsesName);
+                hsCodeList.forEach(hsCode->{
+                    String newCode = getSubHscode(hsCode.getSkuCode());
+                    returnMap.put(newCode,hsCode);
+                });
+            }
+            return returnMap;
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return null;
+    }
+
+    /**
+     * 对商品编码进行处理
+     * @param code
+     * @return
+     */
+    private String getSubHscode(String code){
+        try {
+            if (!StringUtil.isEmptyWithTrim(code) && code.length()>6) {
+                if (code.length() == 7) {
+                    code = "0" + code + "00";
+                } else if (code.length() == 8) {
+                    code = code + "00";
+                } else if (code.length() == 9) {
+                    code = "0" + code;
+                } else if (code.length() > 10) {
+                    code = code.substring(0, 10);
+                }
+                return code;
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return null;
+    }
 }
 }
\ No newline at end of file