添加天眼查接口

src/main/java/com/glxp/udidl/admin/controller/device/UdiInfoController.java

@@ -8,6 +8,7 @@ import com.glxp.udidl.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
 import com.glxp.udidl.admin.entity.udid.UdiEntity;
 import com.glxp.udidl.admin.req.FilterUdiInfoRequest;
+import com.glxp.udidl.admin.req.MutiScanRequest;
 import com.glxp.udidl.admin.req.ProductInfoFilterRequest;
 import com.glxp.udidl.admin.res.BaseResponse;
 import com.glxp.udidl.admin.res.PageSimpleResponse;
@@ -53,7 +54,6 @@ public class UdiInfoController {
         } else {
             filterUdiRelRequest.setDiType(1);
         }
-
         //查出UUID
         ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
         productInfoFilterRequest.setNameCode(nameCode);
@@ -127,6 +127,122 @@ public class UdiInfoController {
         return ResultVOUtils.success(udiAppResponse);
     }
 
+    @GetMapping("udi/basic/app/mutilScan")
+    public BaseResponse mutilScan(MutiScanRequest mutiScanRequest) {
+        if (StrUtil.isEmpty(mutiScanRequest.getCode())) {
+            return ResultVOUtils.error(500, "条码不能为空！");
+        }
+        String code = "";
+        String originCode = mutiScanRequest.getOriginCode();
+        if (originCode == null)
+            originCode = "";
+        code = originCode + mutiScanRequest.getCode();
+        String newCode = mutiScanRequest.getCode();
+        //重复判断
+        if (StrUtil.isNotEmpty(mutiScanRequest.getOriginCode())) {
+            String tempOriginCode = mutiScanRequest.getOriginCode();
+            if (tempOriginCode.endsWith("\u001D")) {
+                tempOriginCode = tempOriginCode.replace("\u001D", "");
+            }
+            UdiEntity originUdiEntity = FilterUdiUtils.getUdi(tempOriginCode);
+            if (StrUtil.isNotEmpty(newCode)) {
+                if (newCode.startsWith("10")) {
+                    if (StrUtil.isNotEmpty(originUdiEntity.getBatchNo())) {
+                        BaseResponse baseResponse = ResultVOUtils.error(501, "批次号重复添加");
+                        baseResponse.setData(originCode);
+                        return baseResponse;
+                    } else {
+                        String msg = checkNewCode(originUdiEntity, newCode);
+                        if (msg != null) {
+                            BaseResponse baseResponse = ResultVOUtils.error(501, msg);
+                            baseResponse.setData(originCode);
+                            return baseResponse;
+                        }
+                    }
+                } else if (newCode.startsWith("17")) {
+                    if (StrUtil.isNotEmpty(originUdiEntity.getExpireDate())) {
+                        BaseResponse baseResponse = ResultVOUtils.error(501, "失效日期重复添加");
+                        baseResponse.setData(originCode);
+                        return baseResponse;
+                    } else {
+                        String msg = checkNewCode(originUdiEntity, newCode);
+                        if (msg != null) {
+                            BaseResponse baseResponse = ResultVOUtils.error(501, msg);
+                            baseResponse.setData(originCode);
+                            return baseResponse;
+                        }
+                    }
+                } else if (newCode.startsWith("11")) {
+                    if (StrUtil.isNotEmpty(originUdiEntity.getProduceDate())) {
+                        BaseResponse baseResponse = ResultVOUtils.error(501, "生产日期重复添加");
+                        baseResponse.setData(originCode);
+                        return baseResponse;
+                    } else {
+                        String msg = checkNewCode(originUdiEntity, newCode);
+                        if (msg != null) {
+                            BaseResponse baseResponse = ResultVOUtils.error(501, msg);
+                            baseResponse.setData(originCode);
+                            return baseResponse;
+                        }
+                    }
+                } else if (newCode.startsWith("21")) {
+                    if (StrUtil.isNotEmpty(originUdiEntity.getSerialNo())) {
+                        BaseResponse baseResponse = ResultVOUtils.error(501, "序列号重复添加");
+                        baseResponse.setData(originCode);
+                        return baseResponse;
+                    } else {
+                        String msg = checkNewCode(originUdiEntity, newCode);
+                        if (msg != null) {
+                            BaseResponse baseResponse = ResultVOUtils.error(501, msg);
+                            baseResponse.setData(originCode);
+                            return baseResponse;
+                        }
+                    }
+                } else {
+                    BaseResponse baseResponse = ResultVOUtils.error(501, "格式错误");
+                    baseResponse.setData(originCode);
+                    return baseResponse;
+                }
+            }
+        }
+
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
+        if (udiEntity == null) {
+            BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
+            baseResponse.setData(originCode);
+            return baseResponse;
+        }
+        if (StrUtil.isNotEmpty(udiEntity.getBatchNo())) {
+            if (code.endsWith("10" + udiEntity.getBatchNo())) {
+                code = code + "\u001D";
+            }
+        }
+
+        return ResultVOUtils.success(code);
+
+    }
+
+
+    public String checkNewCode(UdiEntity originEnity, String newCode) {
+        UdiEntity newEntity = FilterUdiUtils.getUdi(originEnity.getUdi() + newCode);
+        if (newEntity == null || originEnity == null) {
+            return null;
+        }
+        if (StrUtil.isNotEmpty(originEnity.getBatchNo()) && StrUtil.isNotEmpty(newEntity.getBatchNo())) {
+            return "批次号重复添加！";
+        }
+        if (StrUtil.isNotEmpty(originEnity.getProduceDate()) && StrUtil.isNotEmpty(newEntity.getProduceDate())) {
+            return "生产日期重复添加！";
+        }
+        if (StrUtil.isNotEmpty(originEnity.getExpireDate()) && StrUtil.isNotEmpty(newEntity.getExpireDate())) {
+            return "失效日期重复添加！";
+        }
+        if (StrUtil.isNotEmpty(originEnity.getSerialNo()) && StrUtil.isNotEmpty(newEntity.getSerialNo())) {
+            return "序列号重复添加！";
+        }
+        return null;
+    }
+
 
     //获取同步库UDI信息
     @AuthRuleAnnotation("")

src/main/java/com/glxp/udidl/admin/controller/tyapi/TySearchController.java

@@ -0,0 +1,40 @@
+package com.glxp.udidl.admin.controller.tyapi;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.udidl.admin.entity.tyapi.TyCompanySearchEntity;
+import com.glxp.udidl.admin.res.BaseResponse;
+import com.glxp.udidl.admin.service.tyapi.TyCompanySearchService;
+import com.glxp.udidl.admin.util.ResultVOUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "天眼查API接口")
+@RestController
+public class TySearchController {
+
+    @Resource
+    TyCompanySearchService tyCompanySearchService;
+
+    @ApiOperation(value = "天眼查企业信息查询", response = TyCompanySearchEntity.class)
+    @GetMapping("udidl/ty/company/findBycCeditCode")
+    public BaseResponse findBycCeditCode(String creditCode) {
+
+        if (StrUtil.isEmpty(creditCode)) {
+            return ResultVOUtils.error(500, "统一社会信用代码不能为空！");
+        }
+        List<TyCompanySearchEntity> tyCompanySearchEntityList = tyCompanySearchService.list(new QueryWrapper<TyCompanySearchEntity>().eq("creditCode", creditCode));
+        if (CollUtil.isEmpty(tyCompanySearchEntityList)) {
+            return ResultVOUtils.error(500, "查无企业信息");
+        } else {
+            return ResultVOUtils.success(tyCompanySearchEntityList.get(0));
+        }
+    }
+
+}

src/main/java/com/glxp/udidl/admin/dao/tyapi/TyCompanySearchMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.udidl.admin.dao.tyapi;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.udidl.admin.entity.tyapi.TyCompanySearchEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TyCompanySearchMapper extends BaseMapper<TyCompanySearchEntity> {
+}

src/main/java/com/glxp/udidl/admin/entity/tyapi/TyCompanySearchEntity.java

@@ -0,0 +1,69 @@
+package com.glxp.udidl.admin.entity.tyapi;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+@ApiModel(value="com-glxp-udidl-admin-entity-tyapi-TyCompanySearch")
+@Data
+@TableName(value = "ty_company_search")
+public class TyCompanySearchEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private String id;
+
+    @TableField(value = "regStatus")
+    @ApiModelProperty(value="")
+    private String regStatus;
+
+    @TableField(value = "estiblishTime")
+    @ApiModelProperty(value="")
+    private String estiblishTime;
+
+    @TableField(value = "regCapital")
+    @ApiModelProperty(value="")
+    private String regCapital;
+
+    @TableField(value = "companyType")
+    @ApiModelProperty(value="")
+    private String companyType;
+
+    @TableField(value = "matchType")
+    @ApiModelProperty(value="")
+    private String matchType;
+
+    @TableField(value = "`type`")
+    @ApiModelProperty(value="")
+    private String type;
+
+    @TableField(value = "legalPersonName")
+    @ApiModelProperty(value="")
+    private String legalPersonName;
+
+    @TableField(value = "regNumber")
+    @ApiModelProperty(value="")
+    private String regNumber;
+
+    @TableField(value = "creditCode")
+    @ApiModelProperty(value="")
+    private String creditCode;
+
+    @TableField(value = "`name`")
+    @ApiModelProperty(value="")
+    private String name;
+
+    @TableField(value = "orgNumber")
+    @ApiModelProperty(value="")
+    private String orgNumber;
+
+    @TableField(value = "base")
+    @ApiModelProperty(value="")
+    private String base;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/udidl/admin/entity/udi/ProductInfoEntity.java

@@ -134,7 +134,7 @@ public class ProductInfoEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
-    @ApiModelProperty(value = "是否最新")
+    @ApiModelProperty(value = "产品类别")
     private String hchzsb;
 
     @ApiModelProperty(value = "产品类型")

src/main/java/com/glxp/udidl/admin/req/MutiScanRequest.java

@@ -0,0 +1,11 @@
+package com.glxp.udidl.admin.req;
+
+import lombok.Data;
+
+@Data
+public class MutiScanRequest {
+
+    String code;
+    String originCode;
+
+}

src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java

@@ -292,7 +292,7 @@ public class DeviceDownloadService {
         }
         boolean hasData = true; //是否还有数据，如无退出
         while (hasData) {
-            redisUtil.set("allUpdatePage", page);
+            redisUtil.set("allUpdatePage", page+"");
             DataSetResult dataSetResult = getData(deviceRequest, page);
             if (dataSetResult.getReturnCode() != 1 && reCount == 0) {
                 token = "";

src/main/java/com/glxp/udidl/admin/service/tyapi/TyCompanySearchService.java

@@ -0,0 +1,16 @@
+package com.glxp.udidl.admin.service.tyapi;
+
+import com.glxp.udidl.admin.entity.tyapi.TyCompanySearchEntity;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.udidl.admin.dao.tyapi.TyCompanySearchMapper;
+
+@Service
+public class TyCompanySearchService extends ServiceImpl<TyCompanySearchMapper, TyCompanySearchEntity> {
+
+}
+
+
+
+
+

src/main/java/com/glxp/udidl/admin/util/FilterUdiUtils.java

@@ -161,7 +161,7 @@ public class FilterUdiUtils {
         }
 
         if (code.length() < 14) {
-            return ResultVOUtils.error(500, "DI码格式错误！");
+            return ResultVOUtils.error(500, "UDI码格式错误！");
         }
 
         return null;

src/main/resources/mybatis/mapper/tyapi/TyCompanySearchMapper.xml

@@ -0,0 +1,26 @@
+<?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.glxp.udidl.admin.dao.tyapi.TyCompanySearchMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.udidl.admin.entity.tyapi.TyCompanySearchEntity">
+    <!--@mbg.generated-->
+    <!--@Table ty_company_search-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="regStatus" jdbcType="VARCHAR" property="regStatus" />
+    <result column="estiblishTime" jdbcType="VARCHAR" property="estiblishTime" />
+    <result column="regCapital" jdbcType="VARCHAR" property="regCapital" />
+    <result column="companyType" jdbcType="VARCHAR" property="companyType" />
+    <result column="matchType" jdbcType="VARCHAR" property="matchType" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="legalPersonName" jdbcType="VARCHAR" property="legalPersonName" />
+    <result column="regNumber" jdbcType="VARCHAR" property="regNumber" />
+    <result column="creditCode" jdbcType="VARCHAR" property="creditCode" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="orgNumber" jdbcType="VARCHAR" property="orgNumber" />
+    <result column="base" jdbcType="VARCHAR" property="base" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, regStatus, estiblishTime, regCapital, companyType, matchType, `type`, legalPersonName,
+    regNumber, creditCode, `name`, orgNumber, base
+  </sql>
+</mapper>