UDI数据同步，第三方产品信息新增，审核等；手持终端登记审核；

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.controller.auth;
 
+import cn.hutool.core.util.StrUtil;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.Constant;
 import com.glxp.sale.admin.dao.auth.AuthLicenseDao;
@@ -7,6 +8,7 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.auth.AuthLicense;
 import com.glxp.sale.admin.entity.auth.CustomerInfoEntity;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
+import com.glxp.sale.admin.entity.info.DeviceKeyEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.auth.LoginRequest;
 import com.glxp.sale.admin.req.auth.UpdatePasswordRequest;
@@ -14,6 +16,7 @@ import com.glxp.sale.admin.res.auth.LoginUserInfoResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.auth.AuthLoginService;
 import com.glxp.sale.admin.service.auth.CustomerInfoService;
+import com.glxp.sale.admin.service.auth.DeviceKeyService;
 import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.util.AppUtils;
 import com.glxp.sale.admin.util.IpUtils;
@@ -56,6 +59,8 @@ public class LoginController {
     private AuthLicenseDao authLicenseDao;
     @Resource
     CustomerInfoService customerInfoService;
+    @Resource
+    DeviceKeyService deviceKeyService;
 
     /**
      * 用户登录
@@ -105,6 +110,19 @@ public class LoginController {
             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
         }
 
+
+        if (StrUtil.isNotEmpty(loginRequest.getImei())) {
+            DeviceKeyEntity deviceKeyEntity = deviceKeyService.findDeviceByImei(loginRequest.getImei());
+            if (deviceKeyEntity == null) {
+                return ResultVOUtils.error(410, "该设备未注册");
+            } else if (deviceKeyEntity.getIsCheck() == 0) {
+                return ResultVOUtils.error(411, "该设备未审核，请等待审核！");
+            } else if (deviceKeyEntity.getIsCheck() == 2) {
+                return ResultVOUtils.error(412, "该设备被拒绝登录，请联系管理员！");
+            }
+
+        }
+
         // 更新登录状态
         AuthAdmin authAdminUp = new AuthAdmin();
         authAdminUp.setId(authAdmin.getId());

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/ProductInfoController.java

@@ -0,0 +1,249 @@
+package com.glxp.sale.admin.controller.basic;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
+import com.glxp.sale.admin.entity.udid.UdiEntity;
+import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
+import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.res.inout.ProductInfoResponse;
+import com.glxp.sale.admin.service.receipt.ProductInfoService;
+import com.glxp.sale.admin.util.FilterUdiUtils;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+//udi出入库管理系统API
+@RestController
+public class ProductInfoController {
+    @Resource
+    ProductInfoService productInfoService;
+
+
+    //手持枪扫码查询
+    @GetMapping("udidl/device/findBydi")
+    public BaseResponse findProductInfo(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        String key = productInfoFilterRequest.getNameCode();
+        if (key != null) {
+            key = FilterUdiUtils.getDiStr(key);
+            productInfoFilterRequest.setNameCode(key);
+        }
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
+        ProductInfoResponse productInfoResponse = new ProductInfoResponse();
+        if (productInfoEntityList != null && productInfoEntityList.size() > 0) {
+            ProductInfoEntity productInfoEntity = productInfoEntityList.get(productInfoEntityList.size() - 1);
+            productInfoResponse.setProductInfoEntity(productInfoEntity);
+            ProductInfoFilterRequest packFilter = new ProductInfoFilterRequest();
+            packFilter.setUuid(productInfoEntity.getUuid());
+            List<ProductInfoEntity> packInfos = productInfoService.findAll(packFilter);
+            List<ProductInfoEntity> returns = new ArrayList<>();
+            if (packInfos != null && packInfos.size() > 0) {
+                for (ProductInfoEntity temp : packInfos) {
+                    if (!temp.getNameCode().equals(productInfoEntity.getNameCode())) {
+                        returns.add(temp);
+                    }
+                }
+                productInfoResponse.setPackages(returns);
+            }
+            return ResultVOUtils.success(productInfoResponse);
+        } else {
+//            if (key != null && key.length() >= 13)
+//                asyncDownloadTask.downloadByDi(key);    //后台自动下载
+            return ResultVOUtils.error(500, "未找到产品信息");
+        }
+    }
+
+    //管理平台扫码查询
+    @GetMapping("udidl/wms/findBydi")
+    public BaseResponse findBydiWms(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        String key = productInfoFilterRequest.getNameCode();
+        UdiEntity udiEntity = null;
+        if (key != null) {
+            udiEntity = FilterUdiUtils.getUdi(key);
+            key = udiEntity.getUdi();// FilterUdiUtils.getDiStr(key);
+
+            productInfoFilterRequest.setNameCode(key);
+        }
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
+        ProductInfoResponse productInfoResponse = new ProductInfoResponse();
+        if (productInfoEntityList != null && productInfoEntityList.size() > 0) {
+            ProductInfoEntity productInfoEntity = productInfoEntityList.get(productInfoEntityList.size() - 1);
+            if (udiEntity != null) {
+                productInfoEntity.setBatchNo(udiEntity.getBatchNo());
+                productInfoEntity.setProduceDate(udiEntity.getProduceDate());
+                productInfoEntity.setExpireDate(udiEntity.getExpireDate());
+            }
+            productInfoResponse.setProductInfoEntity(productInfoEntity);
+            ProductInfoFilterRequest packFilter = new ProductInfoFilterRequest();
+            packFilter.setUuid(productInfoEntity.getUuid());
+            List<ProductInfoEntity> packInfos = productInfoService.findAll(packFilter);
+            List<ProductInfoEntity> returns = new ArrayList<>();
+            if (packInfos != null && packInfos.size() > 0) {
+                for (ProductInfoEntity temp : packInfos) {
+//                    if (!temp.getNameCode().equals(productInfoEntity.getNameCode())) {
+                    returns.add(temp);
+                    if (udiEntity != null) {
+                        productInfoEntity.setBatchNo(udiEntity.getBatchNo());
+                        productInfoEntity.setProduceDate(udiEntity.getProduceDate());
+                        productInfoEntity.setExpireDate(udiEntity.getExpireDate());
+                    }
+//                    }
+                }
+                productInfoResponse.setPackages(returns);
+            }
+            return ResultVOUtils.success(productInfoResponse);
+        } else {
+//            if (key != null && key.length() >= 13)
+//                asyncDownloadTask.downloadByDi(key);    //后台自动下载
+            return ResultVOUtils.error(500, "未找到产品信息");
+        }
+    }
+
+    //出入库同步下载
+    @GetMapping("udidl/udiwms/syncUdi")
+    public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest);
+        return ResultVOUtils.success(productInfoEntityList);
+
+    }
+
+
+    //开放查询 查询只查询主DI，
+    @GetMapping("udidl/device/filterUdi")
+    public BaseResponse filterUdi(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        //过滤--1.参数不能全未空
+        if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals("")) &&
+                (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals("")) &&
+                (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals("")) &&
+                (productInfoFilterRequest.getGgxh() == null || productInfoFilterRequest.getGgxh().equals("")) &&
+                (productInfoFilterRequest.getUuid() == null || productInfoFilterRequest.getUuid().equals("")) &&
+                (productInfoFilterRequest.getZczbhhzbapzbh() == null || productInfoFilterRequest.getZczbhhzbapzbh().equals("")) &&
+                (productInfoFilterRequest.getDeviceRecordKey() == null || productInfoFilterRequest.getDeviceRecordKey().equals(""))
+        ) {
+            return ResultVOUtils.error(500, "参数不能为空！");
+        }
+
+        if (productInfoFilterRequest.getNameCode() != null && !productInfoFilterRequest.getNameCode().equals("") && productInfoFilterRequest.getNameCode().length() < 10) {
+            return ResultVOUtils.error(500, "请输入完整的最小销售单元标识！");
+        }
+
+        if (productInfoFilterRequest.getYlqxzcrbarmc() != null && !productInfoFilterRequest.getYlqxzcrbarmc().equals("") && productInfoFilterRequest.getYlqxzcrbarmc().length() < 4) {
+            return ResultVOUtils.error(500, "请输入完整的医疗器械注册备案人名称！");
+        }
+
+
+        if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
+                && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
+                && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
+
+        ) {
+            if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
+                return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
+            }
+            if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) {
+                return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
+            }
+        }
+
+        if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) {
+            return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
+        }
+        productInfoFilterRequest.setIsNewest(1);
+        productInfoFilterRequest.setDiType("1");
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest);
+        PageInfo<ProductInfoEntity> pageInfo;
+        pageInfo = new PageInfo<>(productInfoEntityList);
+        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(productInfoEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+
+    }
+
+
+    //开放查询 查询全部，不会过滤只显示主
+    @GetMapping("udidl/device/filterAllUdi")
+    public BaseResponse filterAllUdi(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        //过滤--1.参数不能全未空
+        if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals("")) &&
+                (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals("")) &&
+                (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals("")) &&
+                (productInfoFilterRequest.getGgxh() == null || productInfoFilterRequest.getGgxh().equals("")) &&
+                (productInfoFilterRequest.getUuid() == null || productInfoFilterRequest.getUuid().equals("")) &&
+                (productInfoFilterRequest.getZczbhhzbapzbh() == null || productInfoFilterRequest.getZczbhhzbapzbh().equals("")) &&
+                (productInfoFilterRequest.getDeviceRecordKey() == null || productInfoFilterRequest.getDeviceRecordKey().equals(""))
+        ) {
+            return ResultVOUtils.error(500, "参数不能为空！");
+        }
+
+        if (productInfoFilterRequest.getNameCode() != null && !productInfoFilterRequest.getNameCode().equals("") && productInfoFilterRequest.getNameCode().length() < 10) {
+            return ResultVOUtils.error(500, "请输入完整的最小销售单元标识！");
+        }
+
+        if (productInfoFilterRequest.getYlqxzcrbarmc() != null && !productInfoFilterRequest.getYlqxzcrbarmc().equals("") && productInfoFilterRequest.getYlqxzcrbarmc().length() < 4) {
+            return ResultVOUtils.error(500, "请输入完整的医疗器械注册备案人名称！");
+        }
+
+
+        if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
+                && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
+                && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
+
+        ) {
+            if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
+                return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
+            }
+            if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) {
+                return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
+            }
+        }
+
+        if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) {
+            return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
+        }
+        productInfoFilterRequest.setIsNewest(1);
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest);
+        PageInfo<ProductInfoEntity> pageInfo;
+        pageInfo = new PageInfo<>(productInfoEntityList);
+        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(productInfoEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+
+    }
+
+
+    @GetMapping("udidl/device/filterByUuid")
+    public BaseResponse filterByUuid(ProductInfoFilterRequest productInfoFilterRequest) {
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
+        return ResultVOUtils.success(productInfoEntityList);
+    }
+
+    @GetMapping("udidl/device/filterByNameCode")
+    public BaseResponse filterByNameCode(ProductInfoFilterRequest productInfoFilterRequest) {
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
+        Map<String, List<ProductInfoEntity>> listMap = productInfoEntityList.stream().collect(Collectors.groupingBy(ProductInfoEntity::getUuid));
+        List<ProductInfoEntity> result = null;
+        for (List<ProductInfoEntity> value : listMap.values()) {
+            if (result == null || value.get(0).getVersionNumber() > result.get(0).getVersionNumber()) {
+                result = value;
+            }
+        }
+        productInfoFilterRequest.setNameCode(null);
+        productInfoFilterRequest.setUuid(result.get(0).getUuid());
+        List<ProductInfoEntity> datas = productInfoService.findAll(productInfoFilterRequest);
+        return ResultVOUtils.success(datas);
+    }
+
+}

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiCompanyController.java

@@ -0,0 +1,75 @@
+package com.glxp.sale.admin.controller.basic;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
+import com.glxp.sale.admin.req.basic.UdiCompanyRequest;
+import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
+import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.service.basic.UdiCompanyService;
+import com.glxp.sale.admin.service.receipt.ProductInfoService;
+import com.glxp.sale.common.enums.ResultEnum;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+
+//UDI查询APP API
+@RestController
+public class UdiCompanyController {
+
+    @Resource
+    UdiCompanyService udiCompanyService;
+    @Resource
+    ProductInfoService productInfoService;
+
+    @GetMapping("udi/company/filter")
+    public BaseResponse filterCompany(@Valid UdiCompanyRequest udiCompanyRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.filterUdiCompany(udiCompanyRequest);
+        return ResultVOUtils.success(udiCompanyEntities);
+    }
+
+    @GetMapping("udi/company/filtertByTD")
+    public BaseResponse filtertByTD(ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ProductInfoEntity> productInfoEntities = productInfoService.filterUdiByTyshxydm(productInfoFilterRequest);
+        return ResultVOUtils.success(productInfoEntities);
+    }
+
+    //udi查询app接口，获取企业最新DI
+    @GetMapping("udi/company/filtertUdi")
+    public BaseResponse filtertUdi(ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        List<ProductInfoEntity> productInfoEntities;
+        productInfoFilterRequest.setDiType("1");
+        if (productInfoFilterRequest.isShowHis()) {
+            productInfoEntities = productInfoService.filterUdiByTyshxydm(productInfoFilterRequest);
+        } else {
+            productInfoFilterRequest.setDiType("1");
+            productInfoFilterRequest.setIsNewest(1);
+            productInfoEntities = productInfoService.filterUdiByNewest(productInfoFilterRequest);
+        }
+
+        PageInfo<ProductInfoEntity> pageInfo;
+        pageInfo = new PageInfo<>(productInfoEntities);
+        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(productInfoEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java

@@ -1,15 +1,19 @@
 package com.glxp.sale.admin.controller.info;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
-import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.entity.info.DeviceKeyEntity;
 import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
-import com.glxp.sale.admin.service.info.DeviceKeyService;
+import com.glxp.sale.admin.service.auth.DeviceKeyService;
 import com.glxp.sale.admin.util.DateUtil;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,17 +21,23 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
 import java.security.MessageDigest;
 import java.util.List;
 
+@Slf4j
 @RestController
 public class DeviceKeyController {
-
+    //    @Value("${spring.mail.username}")
+//    private String mail;
+//    @Value("${toMail}")
+//    private String toMail;
     @Resource
     DeviceKeyService deviceKeyService;
+//    @Resource
+//    private JavaMailSender javaMailSender;
 
-    @AuthRuleAnnotation("")
     @GetMapping("sale/device/registerList")
     public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) {
         List<DeviceKeyEntity> deviceKeyEntities = deviceKeyService.findDeviceKey(filterDeviceKeyRequest);
@@ -39,7 +49,7 @@ public class DeviceKeyController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @AuthRuleAnnotation("")
+
     @PostMapping("sale/device/check")
     public BaseResponse checkRegister(@RequestBody @Valid DeviceKeyEntity deviceKeyEntity,
                                       BindingResult bindingResult) {
@@ -53,7 +63,6 @@ public class DeviceKeyController {
 
     }
 
-    @AuthRuleAnnotation("")
     @PostMapping("/sale/info/registerKey")
     public BaseResponse registerKey(@RequestBody DeviceKeyEntity deviceKeyEntity) {
         String key = md5("glxp2020" + deviceKeyEntity.getImei());
@@ -61,17 +70,38 @@ public class DeviceKeyController {
         filterDeviceKeyRequest.setImei(deviceKeyEntity.getImei());
         DeviceKeyEntity deviceKeyEntity1 = deviceKeyService.findDeviceByImei(filterDeviceKeyRequest);
         if (deviceKeyEntity1 == null) {
-            deviceKeyEntity.setImeiKey(key);
+            return ResultVOUtils.success("1");
-            deviceKeyEntity.setDate(DateUtil.getDate());
+        } else if (deviceKeyEntity1.getIsCheck() == 0) {
-            deviceKeyEntity.setIsCheck(0);
-            deviceKeyService.insertDeviceKey(deviceKeyEntity);
-        }
-        if (deviceKeyEntity1.getIsCheck() != 0)
-            return ResultVOUtils.success(key);
-        else
             return ResultVOUtils.success("0");
+        } else {
+            return ResultVOUtils.success(key);
+        }
+
     }
 
+
+    @PostMapping("sale/device/register")
+    public BaseResponse saveRegister(@RequestBody DeviceKeyEntity deviceKeyEntity,
+                                     BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        deviceKeyEntity.setDate(DateUtil.getDateTime());
+        deviceKeyEntity.setIsCheck(0);
+        deviceKeyService.insertDeviceKey(deviceKeyEntity);
+        return ResultVOUtils.success("1");
+    }
+
+//    public void sendMail(String title, String content, String to) {
+//        SimpleMailMessage message = new SimpleMailMessage();
+//        message.setFrom(mail);
+//        message.setTo(to);
+//        message.setSubject(title);
+//        message.setText(content);
+//        javaMailSender.send(message);
+//    }
+
     public String md5(String password) {
         try {
             MessageDigest digest = MessageDigest.getInstance("MD5");

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java

@@ -0,0 +1,118 @@
+package com.glxp.sale.admin.controller.thrsys;
+
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity;
+import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
+import com.glxp.sale.admin.req.info.DeleteRequest;
+import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
+import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.service.auth.CustomerService;
+import com.glxp.sale.admin.service.thrsys.ThrProductsAddService;
+import com.glxp.sale.admin.service.thrsys.ThrProductsService;
+import com.glxp.sale.admin.util.BeanUtils;
+import com.glxp.sale.common.enums.ResultEnum;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+public class ThrProductsAddController {
+    @Resource
+    private ThrProductsAddService thrProductsAddService;
+    @Resource
+    private ThrProductsService thrProductsService;
+    @Resource
+    private CustomerService customerService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/thrsys/getThrAddProducts")
+    public BaseResponse getThrProducts(FilterThrProductsRequest filterThrProductsRequest,
+                                       BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        Long customerId = customerService.getCustomerId();
+        if (customerId != 110) {
+            filterThrProductsRequest.setCustomerId(customerId + "");
+        }
+        List<ThrProductsAddEntity> thrProductsAddEntities
+                = thrProductsAddService.filterThrProductsRequest(filterThrProductsRequest);
+        PageInfo<ThrProductsAddEntity> pageInfo;
+        pageInfo = new PageInfo<>(thrProductsAddEntities);
+        PageSimpleResponse<ThrProductsAddEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrProductsAddEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/delThrAddProducts")
+    public BaseResponse delThrProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        thrProductsAddService.deleteById(id);
+        return ResultVOUtils.success("删除成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/updateThrAddProducts")
+    public BaseResponse updateThrAddProducts(@RequestBody ThrProductsAddEntity thrProductsAddEntity, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        thrProductsAddService.updateThrProducts(thrProductsAddEntity);
+        if (thrProductsAddEntity.getCheckStatus() == 2) {
+            ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
+            thrProductsAddEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + "");
+            BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity);
+            thrProductsService.insertThrProducts(thrProductsEntity);
+        }
+        return ResultVOUtils.success("删除成功");
+    }
+
+
+    /**
+     * 新增第三方产品信息
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/addThrAddProducts")
+    public BaseResponse saveProduct(@RequestBody ThrProductsAddEntity thrProductsAddEntity) {
+        if (null == thrProductsAddEntity)
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+
+        String customerId = customerService.getCustomerId() + "";
+        if (customerId.equals("110")) {
+            ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
+            BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity);
+            thrProductsService.insertThrProducts(thrProductsEntity);
+
+        } else {
+            if (StrUtil.isEmpty(thrProductsAddEntity.getThirdSysFk())) {
+                thrProductsAddEntity.setThirdSysFk("thirdId");
+            }
+            thrProductsAddEntity.setCustomerId(customerId);
+            thrProductsAddEntity.setCheckStatus(1);
+            thrProductsAddService.insertThrProducts(thrProductsAddEntity);
+        }
+
+        return ResultVOUtils.success();
+    }
+
+}

api-admin/src/main/java/com/glxp/sale/admin/dao/auth/DeviceKeyDao.java

@@ -1,8 +1,8 @@
-package com.glxp.sale.admin.dao.info;
+package com.glxp.sale.admin.dao.auth;
 
 import com.glxp.sale.admin.entity.info.DeviceKeyEntity;
-import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest;
+import com.glxp.sale.admin.req.inout.DeleteRequest;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -16,7 +16,9 @@ public interface DeviceKeyDao {
     void insertDeviceKey(DeviceKeyEntity deviceKeyEntity);
 
     void updateDeviceKey(DeviceKeyEntity deviceKeyEntity);
+
     void updateDeviceKeyByImei(DeviceKeyEntity deviceKeyEntity);
+
     void deleteDeviceKey(DeleteRequest deleteRequest);
 
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/basic/ProductInfoDao.java

@@ -1,10 +1,8 @@
 package com.glxp.sale.admin.dao.basic;
 
-import com.glxp.sale.admin.entity.inout.ErpDetailCodeEntity;
-import com.glxp.sale.admin.entity.inout.OrderDetailEntity;
 import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
+import com.glxp.sale.admin.req.ListPageRequest;
 import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
-import com.glxp.sale.admin.res.inout.ProductInfoResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,34 +11,42 @@ import java.util.List;
 @Mapper
 public interface ProductInfoDao {
 
-    List<ProductInfoEntity> filterList(ProductInfoFilterRequest productInfoFilterRequest);
+    List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<ProductInfoResponse> filterDrugList(ProductInfoFilterRequest productInfoFilterRequest);
+    List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<ProductInfoResponse> filterDrugListByUuid(ProductInfoFilterRequest productInfoFilterRequest);
+    List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<ProductInfoResponse> filterUdiList(ProductInfoFilterRequest productInfoFilterRequest);
+    List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> selectByUpdateTime(@Param("startDate") String startDate, @Param("endDate") String endDate);//按更新时间查询
 
     boolean insertProductInfo(ProductInfoEntity productInfoEntity);
 
+    boolean insertProductInfos(@Param("datas") List<ProductInfoEntity> productInfoEntity);
+
     boolean deleteById(@Param("id") String id);
 
     boolean deleteAll(@Param("ids") List<String> ids);
 
-    ProductInfoEntity selectById(@Param("id") String id);
-
     boolean updateProductInfo(ProductInfoEntity productInfoEntity);
 
-    boolean updateUseDy(ProductInfoEntity productInfoEntity);
+    boolean updateProductByUuid(ProductInfoEntity productInfoEntity);
+
+    List<String> findAllUuids(ListPageRequest listPageRequest);
+
+    List<ProductInfoEntity> selectByUuid(@Param("uuid") String uuid);
 
+    List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<OrderDetailEntity> findByCodes(@Param("coedes") List<String> codes);
+    List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
-    String isExit(@Param("nameCode") String nameCode);
+    List<String> filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
 
-    ErpDetailCodeEntity getDetailCode(@Param("code") String code);
+    List<ProductInfoEntity> selectAllByUuid(@Param("ids") List<String> ids);
 
-    ErpDetailCodeEntity getDetailCodeNoBh(@Param("code") String code);
+    List<String> findAllTyshxyh();
 
-    List<String> findNameCodeByGid(@Param("goodsId") String goodsId);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiCompanyDao.java

@@ -0,0 +1,31 @@
+package com.glxp.sale.admin.dao.basic;
+
+import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.sale.admin.entity.udid.Contactlist;
+import com.glxp.sale.admin.req.basic.UdiCompanyRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface UdiCompanyDao {
+
+    List<UdiCompanyEntity> selectAllTyshxyh();
+
+    List<Contactlist> selectContactBykey(@Param("deviceRecordKey") String deviceRecordKey);
+
+    List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest);
+
+    boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+    boolean insertUdiCompanys(@Param("udiCompanyEntities") List<UdiCompanyEntity> udiCompanyEntities);
+
+    boolean deleteById(@Param("id") String id);
+
+    boolean deleteAll(@Param("ids") List<String> ids);
+
+    boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDao.java

@@ -0,0 +1,31 @@
+package com.glxp.sale.admin.dao.thrsys;
+
+import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity;
+import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ThrProductsAddDao {
+
+    List<ThrProductsAddEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
+
+    List<ThrProductsAddEntity> batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest);
+
+    ThrProductsAddEntity selectById(@Param("id") String id);
+
+    List<ThrProductsAddEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
+
+    boolean insertThrProducts(ThrProductsAddEntity thrProductsEntity);
+
+    boolean insertThrProductss(@Param("thrProductsEntities") List<ThrProductsAddEntity> thrProductsEntities);
+
+    boolean updateThrProducts(ThrProductsAddEntity thrProductsEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+    boolean deleteAll();
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/info/DeviceKeyEntity.java

@@ -12,4 +12,8 @@ public class DeviceKeyEntity {
     private String contact;
     private String imeiKey;
     private String date;
+    private String creditNum;
+    private int checkCode;
+    private String rgType;
+    private String remark;
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/receipt/ProductInfoEntity.java

@@ -1,7 +1,10 @@
 package com.glxp.sale.admin.entity.receipt;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class ProductInfoEntity {
     private Integer id;
@@ -12,12 +15,47 @@ public class ProductInfoEntity {
     private Integer bhzxxsbzsl;
     private Integer zxxsbzbhsydysl;
     private String bhxjcpbm;
+    private String sjcpbm;  //
     private String bzcj;
     private String thirdProductNo;
     private String thirdProductName;
     private String addType;
     private String deviceRecordKey;
-    private int isUseDy;
+    private Integer isUseDy;
+    private String cpmctymc;
+    private String cplb;
+    private String flbm;
+    private String ggxh;
+    private String qxlb;
+    private String tyshxydm;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String ylqxzcrbarywmc;
+    private String sydycpbs;
     private String uuid;
+    private Integer versionNumber;
+    private Integer diType;
+
+    private String scbssfbhph;
+    private String scbssfbhxlh;
+    private String scbssfbhscrq;
+    private String scbssfbhsxrq;
+
+    private String ybbm;
+    private String spmc;
+    private String cphhhbh;
+    private String cpms;
+    private String cpbsbmtxmc;
+
+    private String batchNo;
+    private String produceDate;
+    private String expireDate;
+
+    private Boolean isNewest;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+    private String cplx;
+    private String hchzsb;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java

@@ -0,0 +1,43 @@
+package com.glxp.sale.admin.entity.thrsys;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ThrProductsAddEntity {
+
+    private Integer id;
+    private String code;
+    private String name;
+    private String measname;
+    private String spec;
+    private String registerNo;
+    private String manufactory;
+    private String thirdSysFk;
+    private String cplb;
+    private String flbm;
+    private String qxlb;
+    private String ybbm;
+    private String sptm;
+    private String tyshxydm;
+    private String zczbhhzbapzbh;
+    private String ylqxzcrbarmc;
+    private String ylqxzcrbarywmc;
+    private String cpms;
+    private Date updateTime;
+    private String supName;
+    private boolean isChecked;
+
+    //添加字段
+    private String model; //型号
+    private String standard; //规格型号，二合一字段
+    private String qtbm; //其他编码
+    private String zczyxqz; //注册有效期截止时间
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+    private Integer checkStatus;
+    private String customerId;
+}

api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java

@@ -18,4 +18,6 @@ public class LoginRequest {
 
     private Integer type;
 
+    private String imei;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiCompanyRequest.java

@@ -0,0 +1,15 @@
+package com.glxp.sale.admin.req.basic;
+
+import com.glxp.sale.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class UdiCompanyRequest extends ListPageRequest {
+
+    private String ylqxzcrbarmc;
+    private String tyshxydm;
+    private String provinceCode;
+    private String cityCode;
+    private String areaCode;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/req/receipt/ProductInfoFilterRequest.java

@@ -6,10 +6,18 @@ import lombok.Data;
 @Data
 public class ProductInfoFilterRequest extends ListPageRequest {
 
-    private String unit;
-    private String coName;
     private String nameCode;
-    private int addType;
     private String thirdProductNo;
     private String deviceRecordKey;
+    private String uuid;
+    private String cpmctymc;
+    private String ylqxzcrbarmc;
+    private String ggxh;
+    private String tyshxydm;
+    private String authCode;
+    private boolean isShowHis;
+    private String diType;
+    private Integer isNewest;
+    private String zczbhhzbapzbh;
+    private String updateTime;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java

@@ -19,4 +19,6 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private String unionCode;
     private String supName;
     private List<String> codes;
+    private Integer checkStatus;
+    private String customerId;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/inout/ProductInfoResponse.java

@@ -1,42 +1,15 @@
 package com.glxp.sale.admin.res.inout;
 
+import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ProductInfoResponse {
 
-    private Integer id;
+    ProductInfoEntity productInfoEntity;
-    private String type;
+    List<ProductInfoEntity> packages;
-    private String unit;
-    private String coName;
-    private String form;
-    private String formSpec;
-    private String packSpec;
-    private String authCode;
-    private String name;
-    private String nameCode;
-    private String packRatio;
-    private String packLevel;
-    private Integer bhxjsl;
-    private Integer bhzxxsbzsl;
-    private Integer zxxsbzbhsydysl;
-    private String bhxjcpbm;
-    private String bzcj;
-    private String thirdProductNo;
-    private String addType;
-    private String deviceRecordKey;
-    private int isUseDy;
-    private String thirdProductName;
-
-    private String qxlb;
-    private String tyshxydm;
-    private String cpmctymc;
-    private String ybbm;
-    private String cphhhbh;
-    private String ggxh;
-    private String spmc;
-    private String ylqxzcrbarmc;
-
 
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/auth/DeviceKeyService.java

@@ -1,14 +1,18 @@
-package com.glxp.sale.admin.service.info;
+package com.glxp.sale.admin.service.auth;
 
 import com.glxp.sale.admin.entity.info.DeviceKeyEntity;
-import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest;
+import com.glxp.sale.admin.req.inout.DeleteRequest;
 
 import java.util.List;
 
 public interface DeviceKeyService {
     List<DeviceKeyEntity> findDeviceKey(FilterDeviceKeyRequest filterDeviceKeyRequest);
+
     DeviceKeyEntity findDeviceByImei(FilterDeviceKeyRequest filterDeviceKeyRequest);
+
+    DeviceKeyEntity findDeviceByImei(String imei);
+
     void insertDeviceKey(DeviceKeyEntity deviceKeyEntity);
 
     void updateDeviceKeyByImei(DeviceKeyEntity deviceKeyEntity);

api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/DeviceKeyServiceImpl.java

@@ -1,11 +1,11 @@
-package com.glxp.sale.admin.service.info.impl;
+package com.glxp.sale.admin.service.auth.impl;
 
 import com.github.pagehelper.PageHelper;
-import com.glxp.sale.admin.dao.info.DeviceKeyDao;
+import com.glxp.sale.admin.dao.auth.DeviceKeyDao;
 import com.glxp.sale.admin.entity.info.DeviceKeyEntity;
-import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest;
-import com.glxp.sale.admin.service.info.DeviceKeyService;
+import com.glxp.sale.admin.req.inout.DeleteRequest;
+import com.glxp.sale.admin.service.auth.DeviceKeyService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -33,6 +33,14 @@ public class DeviceKeyServiceImpl implements DeviceKeyService {
         return deviceKeyDao.findDeviceByImei(filterDeviceKeyRequest);
     }
 
+    @Override
+    public DeviceKeyEntity findDeviceByImei(String imei) {
+        FilterDeviceKeyRequest filterDeviceKeyRequest = new FilterDeviceKeyRequest();
+        filterDeviceKeyRequest.setImei(imei);
+        DeviceKeyEntity deviceKeyEntity = deviceKeyDao.findDeviceByImei(filterDeviceKeyRequest);
+        return deviceKeyEntity;
+    }
+
     @Override
     public void insertDeviceKey(DeviceKeyEntity deviceKeyEntity) {
         deviceKeyDao.insertDeviceKey(deviceKeyEntity);

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiCompanyService.java

@@ -0,0 +1,28 @@
+package com.glxp.sale.admin.service.basic;
+
+
+import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.sale.admin.entity.udid.Contactlist;
+import com.glxp.sale.admin.req.basic.UdiCompanyRequest;
+
+import java.util.List;
+
+public interface UdiCompanyService {
+
+    List<UdiCompanyEntity> selectAllTyshxyh();
+
+    List<Contactlist> selectContactBykey(String deviceRecordKey);
+
+    List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest);
+
+    boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+    boolean insertUdiCompanys(List<UdiCompanyEntity> udiCompanyEntities);
+
+    boolean deleteById(String id);
+
+    boolean deleteAll(List<String> ids);
+
+    boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+}

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiCompanyServiceImpl.java

@@ -0,0 +1,63 @@
+package com.glxp.sale.admin.service.basic.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.dao.basic.UdiCompanyDao;
+import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.sale.admin.entity.udid.Contactlist;
+import com.glxp.sale.admin.req.basic.UdiCompanyRequest;
+import com.glxp.sale.admin.service.basic.UdiCompanyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class UdiCompanyServiceImpl implements UdiCompanyService {
+
+    @Resource
+    UdiCompanyDao udiCompanyDao;
+
+    @Override
+    public List<UdiCompanyEntity> selectAllTyshxyh() {
+        return udiCompanyDao.selectAllTyshxyh();
+    }
+
+    @Override
+    public List<Contactlist> selectContactBykey(String deviceRecordKey) {
+        return udiCompanyDao.selectContactBykey(deviceRecordKey);
+    }
+
+    @Override
+    public List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest) {
+        if (udiCompanyRequest.getPage() != null && udiCompanyRequest.getLimit() != null) {
+            int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit();
+            PageHelper.offsetPage(offset, udiCompanyRequest.getLimit());
+        }
+        return udiCompanyDao.filterUdiCompany(udiCompanyRequest);
+    }
+
+    @Override
+    public boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity) {
+        return udiCompanyDao.insertUdiCompany(udiCompanyEntity);
+    }
+
+    @Override
+    public boolean insertUdiCompanys(List<UdiCompanyEntity> udiCompanyEntities) {
+        return udiCompanyDao.insertUdiCompanys(udiCompanyEntities);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return udiCompanyDao.deleteById(id);
+    }
+
+    @Override
+    public boolean deleteAll(List<String> ids) {
+        return udiCompanyDao.deleteAll(ids);
+    }
+
+    @Override
+    public boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity) {
+        return udiCompanyDao.updateUdiCompany(udiCompanyEntity);
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/service/receipt/ProductInfoService.java

@@ -1,41 +1,49 @@
 package com.glxp.sale.admin.service.receipt;
 
-import com.glxp.sale.admin.entity.inout.ErpDetailCodeEntity;
+
-import com.glxp.sale.admin.entity.inout.OrderDetailEntity;
 import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
-import com.glxp.sale.admin.res.inout.ProductInfoResponse;
 
 import java.util.List;
 
 public interface ProductInfoService {
 
-    List<ProductInfoEntity> filterList(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<ProductInfoResponse> filterDrugList(ProductInfoFilterRequest productInfoFilterRequest);
+    //赋码用
+    //获取产品名称通用名称
+    List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<ProductInfoResponse> filterDrugListByUuid(ProductInfoFilterRequest productInfoFilterRequest);
+    List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<ProductInfoResponse> filterUdiList(ProductInfoFilterRequest productInfoFilterRequest);
+    List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
 
-    boolean insertProductInfo(ProductInfoEntity productInfoEntity);
+    List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
 
-    boolean updateProductInfo(ProductInfoEntity productInfoEntity);
+    List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest);
-    boolean updateUseDy(ProductInfoEntity productInfoEntity);
-    boolean deleteById(String id);
 
-    boolean deleteAll(List<String> ids);
+    List<ProductInfoEntity> findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
-    ProductInfoEntity selectById(String id);
+    List<ProductInfoEntity> selectByUuid(String uuid);
 
-    List<OrderDetailEntity> findByCodes(List<String> codes);
+    List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<String> findNameCodeByGid(String goodsId);
+    List<ProductInfoEntity> findAll(ProductInfoFilterRequest productInfoFilterRequest);
 
-    boolean isExit(String nameCode);
+    List<ProductInfoEntity> selectByUpdateTime(String startDate, String endDate);//按更新时间查询
+
+    boolean insertProductInfo(ProductInfoEntity productInfoEntity);
 
-    ErpDetailCodeEntity getDetailCode(String code);
+    boolean insertProductInfos(List<ProductInfoEntity> productInfoEntities);
+
+    boolean updateProductByUuid(ProductInfoEntity productInfoEntity);
+
+    boolean deleteById(String id);
+
+    boolean deleteAll(List<String> ids);
+
+    boolean updateProductInfo(ProductInfoEntity productInfoEntity);
 
-    ErpDetailCodeEntity getDetailCodeNoBh(String code);
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java

@@ -2,11 +2,8 @@ package com.glxp.sale.admin.service.receipt.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.basic.ProductInfoDao;
-import com.glxp.sale.admin.entity.inout.ErpDetailCodeEntity;
-import com.glxp.sale.admin.entity.inout.OrderDetailEntity;
 import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
-import com.glxp.sale.admin.res.inout.ProductInfoResponse;
 import com.glxp.sale.admin.service.receipt.ProductInfoService;
 import org.springframework.stereotype.Service;
 
@@ -21,112 +18,136 @@ public class ProductInfoServiceImpl implements ProductInfoService {
     ProductInfoDao productInfoDao;
 
     @Override
-    public List<ProductInfoEntity> filterList(ProductInfoFilterRequest productInfoFilterRequest) {
+    public List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        List<ProductInfoEntity> data = productInfoDao.filterCpmctymc(productInfoFilterRequest);
+        return data;
+    }
 
+    @Override
+    public List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest) {
         if (productInfoFilterRequest == null) {
             return Collections.emptyList();
         }
-        if(productInfoFilterRequest.getPage()!=null){
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
             int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
             PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
         }
 
-        List<ProductInfoEntity> data = productInfoDao.filterList(productInfoFilterRequest);
+        List<ProductInfoEntity> data = productInfoDao.filterProductInfo(productInfoFilterRequest);
-
         return data;
     }
 
     @Override
-    public List<ProductInfoResponse> filterDrugList(ProductInfoFilterRequest productInfoFilterRequest) {
+    public List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) {
-        if (productInfoFilterRequest == null) {
+
-            return Collections.emptyList();
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
         }
-        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        return productInfoDao.filterUdiByTyshxydm(productInfoFilterRequest);
-        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+
-        List<ProductInfoResponse> data = productInfoDao.filterDrugList(productInfoFilterRequest);
-        return data;
     }
 
     @Override
-    public List<ProductInfoResponse> filterDrugListByUuid(ProductInfoFilterRequest productInfoFilterRequest) {
+    public List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest) {
-        if (productInfoFilterRequest == null) {
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
-            return Collections.emptyList();
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
         }
-        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        return productInfoDao.filterUdiByCreditNo(productInfoFilterRequest);
-        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
-        List<ProductInfoResponse> data = productInfoDao.filterDrugListByUuid(productInfoFilterRequest);
-        return data;
     }
 
-
     @Override
-    public List<ProductInfoResponse> filterUdiList(ProductInfoFilterRequest productInfoFilterRequest) {
+    public List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest) {
-        if (productInfoFilterRequest == null) {
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
-            return Collections.emptyList();
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
         }
-        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        return productInfoDao.filterUdiByNewest(productInfoFilterRequest);
-        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
-        List<ProductInfoResponse> data = productInfoDao.filterUdiList(productInfoFilterRequest);
-        return data;
     }
 
-
     @Override
-    public boolean insertProductInfo(ProductInfoEntity productInfoEntity) {
+    public List<ProductInfoEntity> findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest) {
-        return productInfoDao.insertProductInfo(productInfoEntity);
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+        List<String> uuids = productInfoDao.filterUuidByCreditNo(productInfoFilterRequest);
+        if (uuids != null && uuids.size() > 0)
+            return productInfoDao.selectAllByUuid(uuids);
+        else
+            return null;
     }
 
     @Override
-    public boolean updateProductInfo(ProductInfoEntity productInfoEntity) {
+    public List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest) {
-        return productInfoDao.updateProductInfo(productInfoEntity);
+        if (productInfoFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (productInfoFilterRequest.getPage() != null) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+
+        List<ProductInfoEntity> data = productInfoDao.filterUdi(productInfoFilterRequest);
+        return data;
     }
 
     @Override
-    public boolean updateUseDy(ProductInfoEntity productInfoEntity) {
+    public List<ProductInfoEntity> selectByUuid(String uuid) {
-        return productInfoDao.updateUseDy(productInfoEntity);
+        List<ProductInfoEntity> data = productInfoDao.selectByUuid(uuid);
+        return data;
     }
 
     @Override
-    public boolean deleteById(String id) {
+    public List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest) {
-        return productInfoDao.deleteById(id);
+        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit() + 1;
+        productInfoFilterRequest.setPage(offset);
+        return productInfoDao.syncDlUdi(productInfoFilterRequest);
     }
 
     @Override
-    public boolean deleteAll(List<String> ids) {
+    public List<ProductInfoEntity> findAll(ProductInfoFilterRequest productInfoFilterRequest) {
-        return productInfoDao.deleteAll(ids);
+        List<ProductInfoEntity> data = productInfoDao.filterProductInfo(productInfoFilterRequest);
+        return data;
     }
 
-    @Override
+    public List<ProductInfoEntity> selectByUpdateTime(String startDate, String endDate) {
-    public ProductInfoEntity selectById(String id) {
+        return productInfoDao.selectByUpdateTime(startDate, endDate);
-        return productInfoDao.selectById(id);
     }
 
+    @Override
+    public boolean insertProductInfo(ProductInfoEntity productInfoEntity) {
+        return productInfoDao.insertProductInfo(productInfoEntity);
+    }
 
     @Override
-    public List<OrderDetailEntity> findByCodes(List<String> codes) {
+    public boolean insertProductInfos(List<ProductInfoEntity> productInfoEntities) {
-        return productInfoDao.findByCodes(codes);
+        return productInfoDao.insertProductInfos(productInfoEntities);
     }
 
     @Override
-    public List<String> findNameCodeByGid(String goodsId) {
+    public boolean updateProductByUuid(ProductInfoEntity productInfoEntity) {
-        return productInfoDao.findNameCodeByGid(goodsId);
+        return productInfoDao.updateProductByUuid(productInfoEntity);
     }
 
     @Override
-    public boolean isExit(String nameCode) {
+    public boolean updateProductInfo(ProductInfoEntity productInfoEntity) {
-        String name = productInfoDao.isExit(nameCode);
+        return productInfoDao.updateProductInfo(productInfoEntity);
-        if (name == null) {
-            return false;
-        } else return true;
     }
 
     @Override
-    public ErpDetailCodeEntity getDetailCode(String code) {
+    public boolean deleteById(String id) {
-        return productInfoDao.getDetailCode(code);
+        return productInfoDao.deleteById(id);
     }
 
     @Override
-    public ErpDetailCodeEntity getDetailCodeNoBh(String code) {
+    public boolean deleteAll(List<String> ids) {
-        return productInfoDao.getDetailCodeNoBh(code);
+        return productInfoDao.deleteAll(ids);
     }
-}
+}

api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddService.java

@@ -0,0 +1,26 @@
+package com.glxp.sale.admin.service.thrsys;
+
+import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity;
+import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
+import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
+
+import java.util.List;
+
+public interface ThrProductsAddService {
+
+    List<ThrProductsAddEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
+
+    List<ThrProductsAddEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
+
+    ThrProductsAddEntity selectById(String id);
+
+    boolean insertThrProducts(ThrProductsAddEntity thrProductsEntity);
+
+    boolean insertThrProductss(List<ThrProductsAddEntity> thrProductsEntities);
+
+    boolean updateThrProducts(ThrProductsAddEntity thrProductsEntity);
+
+    boolean deleteById(String id);
+
+    boolean deleteAll();
+}

api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddServiceImpl.java

@@ -0,0 +1,76 @@
+package com.glxp.sale.admin.service.thrsys.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.dao.thrsys.ThrProductsAddDao;
+import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity;
+import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
+import com.glxp.sale.admin.service.thrsys.ThrProductsAddService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class ThrProductsAddServiceImpl implements ThrProductsAddService {
+
+    @Resource
+    ThrProductsAddDao thrProductsAddDao;
+
+
+    @Override
+    public List<ThrProductsAddEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest) {
+        if (filterThrProductsRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterThrProductsRequest.getPage() != null) {
+            int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
+        }
+        List<ThrProductsAddEntity> data = thrProductsAddDao.filterThrProductsRequest(filterThrProductsRequest);
+        return data;
+    }
+
+    @Override
+    public List<ThrProductsAddEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest) {
+        if (filterThrProductsRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterThrProductsRequest.getPage() != null) {
+            int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
+        }
+        List<ThrProductsAddEntity> data = thrProductsAddDao.selectThrProducts(filterThrProductsRequest);
+        return data;
+    }
+
+    @Override
+    public ThrProductsAddEntity selectById(String id) {
+        return thrProductsAddDao.selectById(id);
+    }
+
+    @Override
+    public boolean insertThrProducts(ThrProductsAddEntity thrProductsEntity) {
+        return thrProductsAddDao.insertThrProducts(thrProductsEntity);
+    }
+
+    @Override
+    public boolean insertThrProductss(List<ThrProductsAddEntity> thrProductsEntities) {
+        return thrProductsAddDao.insertThrProductss(thrProductsEntities);
+    }
+
+    @Override
+    public boolean updateThrProducts(ThrProductsAddEntity thrProductsEntity) {
+        return thrProductsAddDao.updateThrProducts(thrProductsEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return thrProductsAddDao.deleteById(id);
+    }
+
+    @Override
+    public boolean deleteAll() {
+        return thrProductsAddDao.deleteAll();
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncCompanyDlHelper.java

@@ -0,0 +1,51 @@
+package com.glxp.sale.admin.thread;
+
+import com.glxp.sale.admin.dao.basic.ProductInfoDao;
+import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.sale.admin.service.basic.UdiCompanyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class AsyncCompanyDlHelper {
+    @Resource
+    UdiCompanyService udiCompanyService;
+    @Resource
+    ProductInfoDao productInfoDao;
+
+    @Value("${UDI_SERVER_URL}")
+    private String udiUrl;
+
+    private static final Logger logger = LoggerFactory.getLogger(AsyncCompanyDlHelper.class);
+
+
+    @Async
+    public void asyncDiByTime(String updateTime) {
+        AsyncDiDlHelper asyncDiDlHelper = new AsyncDiDlHelper();
+        int page = 1;
+        int limit = 300;
+        while (true) {
+            logger.info("更新时间：" + updateTime + "----" + page + "----" + limit);
+            List<UdiCompanyEntity> udiCompanyEntities = asyncDiDlHelper.dlCompanyByTime(udiUrl, page, limit, updateTime);
+            if (udiCompanyEntities != null && udiCompanyEntities.size() > 0) {
+                udiCompanyService.insertUdiCompanys(udiCompanyEntities);
+                if (udiCompanyEntities.size() < limit) {
+                    break;
+                } else {
+                    page++;
+                }
+            } else {
+                break;
+            }
+        }
+        logger.info("更新时间：" + updateTime + "----" + "下载结束");
+    }
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncCompanyDlTask.java

@@ -0,0 +1,57 @@
+package com.glxp.sale.admin.thread;
+
+import com.glxp.sale.admin.dao.info.ScheduledDao;
+import com.glxp.sale.admin.entity.info.ScheduledEntity;
+import com.glxp.sale.admin.req.udid.ScheduledRequest;
+import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.RedisUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Component
+@EnableScheduling
+public class AsyncCompanyDlTask implements SchedulingConfigurer {
+
+    final Logger logger = LoggerFactory.getLogger(AsyncDiDlTask.class);
+    @Resource
+    AsyncCompanyDlHelper udiCompanyTask;
+    @Resource
+    RedisUtil redisUtil;
+
+    @Resource
+    private ScheduledDao scheduledDao;
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        scheduledTaskRegistrar.addTriggerTask(() -> process(),
+                triggerContext -> {
+                    ScheduledRequest scheduledRequest = new ScheduledRequest();
+                    scheduledRequest.setCronName("syncCompany");
+                    ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
+                    String cron = scheduledEntity.getCron();//"0 55 5 * * ?";
+                    if (cron.isEmpty()) {
+                        logger.error("cron is null");
+                    }
+                    return new CronTrigger(cron).nextExecutionTime(triggerContext);
+                });
+    }
+
+    private void process() {
+
+        String lastUpDiTime = (String) redisUtil.get("lastUpCompanyTime");
+        if (lastUpDiTime == null) {
+            lastUpDiTime = DateUtil.getLastDayFormat(-10);
+        }
+        udiCompanyTask.asyncDiByTime(lastUpDiTime);
+        redisUtil.set("lastUpCompanyTime", DateUtil.formatDate(new Date()));
+    }
+
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java

@@ -0,0 +1,48 @@
+package com.glxp.sale.admin.thread;
+
+import com.alibaba.fastjson.JSONObject;
+import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
+import com.glxp.sale.admin.util.HttpClient;
+import com.glxp.sale.common.res.BaseResponse;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class AsyncDiDlHelper {
+
+    public List<ProductInfoEntity> dlByTime(String udiUrl, int page, int limit, String updateTime) {
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("page", page);
+        paramMap.put("limit", limit);
+        paramMap.put("updateTime", updateTime);
+        String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncUdi", paramMap);
+        try {
+            BaseResponse<List<ProductInfoEntity>> udiDlDeviceResponse = (BaseResponse<List<ProductInfoEntity>>) JSONObject.parseObject(response, BaseResponse.class);
+            List<ProductInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
+            return udiInfoEntities;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public List<UdiCompanyEntity> dlCompanyByTime(String udiUrl, int page, int limit, String updateTime) {
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("page", page);
+        paramMap.put("limit", limit);
+        paramMap.put("updateTime", updateTime);
+        String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncCompany", paramMap);
+        try {
+            BaseResponse<List<UdiCompanyEntity>> baseResponse = (BaseResponse<List<UdiCompanyEntity>>) JSONObject.parseObject(response, BaseResponse.class);
+            List<UdiCompanyEntity> udiCompanyEntities = baseResponse.getData();
+            return udiCompanyEntities;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlService.java

@@ -0,0 +1,74 @@
+package com.glxp.sale.admin.thread;
+
+import com.alibaba.fastjson.JSONArray;
+import com.glxp.sale.admin.entity.basic.UdiInfoImportLogEntity;
+import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
+import com.glxp.sale.admin.entity.thrsys.ThrImportLogEntity;
+import com.glxp.sale.admin.service.basic.UdiInfoImportLogService;
+import com.glxp.sale.admin.service.receipt.ProductInfoService;
+import com.glxp.sale.admin.service.thrsys.ThrImportLogService;
+import com.glxp.sale.admin.util.CustomUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class AsyncDiDlService {
+
+
+    @Value("${UDI_SERVER_URL}")
+    private String udiUrl;
+
+    @Resource
+    ProductInfoService productInfoService;
+    @Resource
+    ThrImportLogService udiInfoImportLogService;
+    private static final Logger logger = LoggerFactory.getLogger(AsyncDiDlService.class);
+
+    @Async
+    public void asyncDiByTime(String updateTime) {
+        AsyncDiDlHelper asyncDiDlHelper = new AsyncDiDlHelper();
+        int page = 1;
+        int limit = 200;
+        while (true) {
+            logger.info("更新时间：" + updateTime + "----" + page + "----" + limit);
+            List<ProductInfoEntity> productInfoEntityList = asyncDiDlHelper.dlByTime(udiUrl, page, limit, updateTime);
+            if (productInfoEntityList != null && productInfoEntityList.size() > 0) {
+                productInfoService.insertProductInfos(productInfoEntityList);
+                if (productInfoEntityList.size() < limit) {
+                    break;
+                } else {
+                    page++;
+                }
+            } else {
+                break;
+            }
+        }
+        logger.info("更新时间：" + updateTime + "----" + "下载结束");
+    }
+
+    @Async
+    public void importJsonData(String genKey, String laststr) {
+        ThrImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey);
+        udiInfoImportLogEntity.setStatus(1);
+        udiInfoImportLogEntity.setFromType("2");
+        udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity);
+        List<ProductInfoEntity> productInfoEntities = JSONArray.parseArray(laststr, ProductInfoEntity.class);
+        List<List<ProductInfoEntity>> splitList = CustomUtil.splitList(productInfoEntities, 500);
+        for (List<ProductInfoEntity> data : splitList) {
+            productInfoService.insertProductInfos(data);
+        }
+        udiInfoImportLogEntity.setStatus(3);//处理成功
+        udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity);
+
+    }
+
+
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlTask.java

@@ -0,0 +1,60 @@
+package com.glxp.sale.admin.thread;
+
+import com.glxp.sale.admin.dao.info.ScheduledDao;
+import com.glxp.sale.admin.entity.info.ScheduledEntity;
+import com.glxp.sale.admin.req.udid.ScheduledRequest;
+import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.RedisUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Component
+@EnableScheduling
+public class AsyncDiDlTask implements SchedulingConfigurer {
+
+    final Logger logger = LoggerFactory.getLogger(AsyncDiDlTask.class);
+    @Resource
+    RedisUtil redisUtil;
+    @Resource
+    private ScheduledDao scheduledDao;
+    @Resource
+    AsyncDiDlService asyncDiDlService;
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        scheduledTaskRegistrar.addTriggerTask(() -> process(),
+                triggerContext -> {
+                    ScheduledRequest scheduledRequest = new ScheduledRequest();
+                    scheduledRequest.setCronName("syncDi");
+                    ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
+                    String cron = scheduledEntity.getCron();//"0 55 5 * * ?";
+                    if (cron.isEmpty()) {
+                        logger.error("cron is null");
+                    }
+                    return new CronTrigger(cron).nextExecutionTime(triggerContext);
+                });
+    }
+
+    private void process() {
+        String day = DateUtil.getLastDayFormat(-1);
+        asyncDiDlService.asyncDiByTime(day);
+
+
+        String lastUpDiTime = (String) redisUtil.get("lastDiUpTime");
+        if (lastUpDiTime == null) {
+            lastUpDiTime = DateUtil.getLastDayFormat(-10);
+        }
+        asyncDiDlService.asyncDiByTime(lastUpDiTime);
+        redisUtil.set("lastDiUpTime", DateUtil.formatDate(new Date()));
+    }
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java

@@ -531,4 +531,13 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
         }
         return null;
     }
+    public static String getLastDayFormat(int amount) {
+        SimpleDateFormat smdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(new Date());
+        calendar.add(calendar.DATE, amount);
+        String formatDate = smdate.format(calendar.getTime());
+        return formatDate;
+    }
+
 }

api-admin/src/main/resources/mybatis/mapper/auth/DeviceKeyDao.xml

@@ -1,7 +1,7 @@
 <?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.sale.admin.dao.info.DeviceKeyDao">
+<mapper namespace="com.glxp.sale.admin.dao.auth.DeviceKeyDao">
 
 
     <select id="findDeviceKey" parameterType="com.glxp.sale.admin.req.info.FilterDeviceKeyRequest"
@@ -38,6 +38,10 @@
             <if test="contact != null">contact=#{contact},</if>
             <if test="imeiKey != null">imeiKey=#{imeiKey},</if>
             <if test="date != null">date=#{date},</if>
+            <if test="creditNum != null">creditNum=#{creditNum},</if>
+            <if test="rgType != null">rgType=#{rgType},</if>
+            <if test="remark != null">remark=#{remark},</if>
+
         </set>
         WHERE id=#{id}
 
@@ -54,19 +58,22 @@
             <if test="imeiKey != null">imeiKey=#{imeiKey},</if>
             <if test="date != null">date=#{date},</if>
             <if test="imei != null">imei=#{imei},</if>
+            <if test="creditNum != null">creditNum=#{creditNum},</if>
+            <if test="rgType != null">rgType=#{rgType},</if>
+            <if test="remark != null">remark=#{remark},</if>
         </set>
         WHERE imei=#{imei}
     </update>
 
     <insert id="insertDeviceKey" parameterType="com.glxp.sale.admin.entity.info.DeviceKeyEntity">
-       INSERT INTO device_check(
+       replace INTO device_check(
        imei,
        isCheck,
        companyName,
        phone,
        contact,
        date,
-       imeiKey) values
+       imeiKey,creditNum,rgType,remark) values
        (
         #{imei},
         #{isCheck},
@@ -74,7 +81,7 @@
         #{phone},
         #{contact},
         #{date},
-        #{imeiKey}
+        #{imeiKey},#{creditNum},#{rgType},#{remark}
 
        )
     </insert>

api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -0,0 +1,510 @@
+<?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.sale.admin.dao.basic.ProductInfoDao">
+
+    <select id="filterProductInfo" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        SELECT * FROM productinfo
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat(#{ggxh},'%')
+            </if>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+
+
+        </where>
+
+    </select>
+
+
+    <select id="filterCpmctymc" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        select * from productinfo
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+        GROUP BY cpmctymc
+    </select>
+
+
+    <select id="filterUdiByTyshxydm" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        SELECT * FROM productinfo
+        <where>
+            diType = 1
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+        GROUP BY nameCode
+    </select>
+
+    <select id="selectAllByUuid" parameterType="java.util.List"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        select * from productinfo where
+        uuid in (
+        <foreach collection="ids" item="item" index="index"
+                 separator=",">
+            #{item}
+        </foreach>
+        )
+    </select>
+
+
+    <select id="selectByUuid" parameterType="Map"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        select *
+        from productinfo
+        where uuid = #{uuid}
+    </select>
+    <!--   CHAR_LENGTH(nameCode)  <![CDATA[ >= ]]>  14-->
+    <select id="filterUdiByCreditNo" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+
+        select p.* from productinfo p INNER JOIN
+        (select deviceRecordKey ,max(versionNumber) versionNumber from productinfo
+
+        <where>
+
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+        </where>
+        GROUP BY deviceRecordKey)
+        a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
+        <where>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="filterUdiByNewest" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+
+        SELECT * FROM productinfo
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="isNewest != null">
+                AND isNewest = #{isNewest}
+            </if>
+        </where>
+    </select>
+
+    <select id="filterUuidByCreditNo" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="java.lang.String">
+
+        select p.uuid from productinfo p INNER JOIN
+        (select deviceRecordKey ,max(versionNumber) versionNumber from productinfo
+
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+        </where>
+        GROUP BY deviceRecordKey)
+        a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
+        group by uuid
+    </select>
+    <select id="filterUdi" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+
+        select * from productinfo
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc= #{ylqxzcrbarmc}
+            </if>
+
+            <if test="ylqxzcrbarmc == '' and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%',#{ggxh},'%')
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh},'%')
+            </if>
+
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+            <if test="isNewest != null and isNewest!=''">
+                AND isNewest = #{isNewest}
+            </if>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+        </where>
+
+
+    </select>
+    <select id="selectByUpdateTime"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        select *
+        from productinfo
+        where
+ <![CDATA[   DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S')   ]]>
+        and
+  <![CDATA[   DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S')
+        ]]>
+    </select>
+    <!--<select id="filterUdi" parameterType="com.glxp.sync.admin.req.ProductInfoFilterRequest"-->
+    <!--resultType="com.glxp.sync.admin.entity.udi.ProductInfoEntity">-->
+    <!--&#45;&#45;         GROUP BY deviceRecordKey-->
+    <!--select p.* from productinfo p INNER JOIN-->
+    <!--(select deviceRecordKey ,max(versionNumber) versionNumber from productinfo-->
+    <!--<where>-->
+
+    <!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">-->
+    <!--AND ylqxzcrbarmc= #{ylqxzcrbarmc}-->
+    <!--</if>-->
+
+    <!--<if test="ylqxzcrbarmc == '' and ylqxzcrbarmc == null and cpmctymc != '' and cpmctymc != null">-->
+    <!--AND cpmctymc LIKE concat(#{cpmctymc},'%')-->
+    <!--</if>-->
+
+    <!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">-->
+    <!--AND cpmctymc LIKE concat('%',#{cpmctymc},'%')-->
+    <!--</if>-->
+    <!--<if test="nameCode != '' and nameCode != null">-->
+    <!--AND nameCode LIKE concat(#{nameCode},'%')-->
+    <!--</if>-->
+    <!--<if test="uuid != '' and uuid != null">-->
+    <!--AND uuid = #{uuid}-->
+    <!--</if>-->
+    <!--<if test="ggxh != '' and ggxh != null">-->
+    <!--AND ggxh LIKE concat('%',#{ggxh},'%')-->
+    <!--</if>-->
+    <!--<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">-->
+    <!--AND zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh},'%')-->
+    <!--</if>-->
+
+    <!--<if test="deviceRecordKey != '' and deviceRecordKey != null">-->
+    <!--AND deviceRecordKey = #{deviceRecordKey}-->
+    <!--</if>-->
+    <!--<if test="updateTime!=null and updateTime!=''">-->
+    <!--<![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>-->
+    <!--</if>-->
+    <!--</where>-->
+    <!--GROUP BY deviceRecordKey)-->
+    <!--a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber-->
+
+    <!--</select>-->
+
+    <select id="syncDlUdi" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+
+        SELECT * FROM productinfo
+        <where>
+
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%',#{ggxh},'%')
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh = #{zczbhhzbapzbh}
+            </if>
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+        limit #{page},#{limit}
+    </select>
+
+
+    <insert id="insertProductInfo" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        REPLACE
+        INTO productinfo
+        (
+        id,nameCode,packRatio,packLevel,bhxjsl,
+        bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
+        cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
+        ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
+        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
+        )
+        values
+            (
+        #{id},
+        #{nameCode},
+        #{packRatio},
+        #{packLevel},
+        #{bhxjsl},
+        #{bhzxxsbzsl},
+        #{zxxsbzbhsydysl},
+        #{bhxjcpbm},
+        #{bzcj},
+        #{thirdProductNo},
+        #{addType},
+        #{deviceRecordKey},
+        #{isUseDy},
+        #{thirdProductName},
+        #{cpmctymc},
+        #{cplb},
+        #{flbm},
+        #{ggxh},
+        #{qxlb},
+        #{tyshxydm},
+        #{ylqxzcrbarmc},
+        #{zczbhhzbapzbh},
+        #{ylqxzcrbarywmc},
+        #{uuid},
+        #{sjcpbm},
+        #{versionNumber},
+        #{diType},
+        #{scbssfbhph},
+        #{scbssfbhxlh},
+        #{scbssfbhscrq},
+        #{scbssfbhsxrq},
+        #{ybbm},
+        #{spmc},
+        #{cphhhbh},
+        #{cpms},
+        #{cpbsbmtxmc},
+        #{isNewest},
+        #{updateTime}
+        )
+    </insert>
+
+
+    <insert id="insertProductInfos" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        REPLACE INTO productinfo
+        (
+        id,nameCode,packRatio,packLevel,bhxjsl,
+        bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
+        cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
+        ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
+        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
+        ) values
+
+        <foreach collection="datas" item="item" index="index"
+                 separator=",">
+
+
+            (
+            #{item.id},
+            #{item.nameCode},
+            #{item.packRatio},
+            #{item.packLevel},
+            #{item.bhxjsl},
+            #{item.bhzxxsbzsl},
+            #{item.zxxsbzbhsydysl},
+            #{item.bhxjcpbm},
+            #{item.bzcj},
+            #{item.thirdProductNo},
+            #{item.addType},
+            #{item.deviceRecordKey},
+            #{item.isUseDy},
+            #{item.thirdProductName},
+            #{item.cpmctymc},
+            #{item.cplb},
+            #{item.flbm},
+            #{item.ggxh},
+            #{item.qxlb},
+            #{item.tyshxydm},
+            #{item.ylqxzcrbarmc},
+            #{item.zczbhhzbapzbh},
+            #{item.ylqxzcrbarywmc},
+            #{item.uuid},
+            #{item.sjcpbm},
+            #{item.versionNumber},
+            #{item.diType},
+            #{item.scbssfbhph},
+            #{item.scbssfbhxlh},
+            #{item.scbssfbhscrq},
+            #{item.scbssfbhsxrq},
+            #{item.ybbm},
+            #{item.spmc},
+            #{item.cphhhbh},
+            #{item.cpms},
+            #{item.cpbsbmtxmc},
+            #{item.isNewest},
+            #{item.updateTime}
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM productinfo
+        WHERE thirdProductNo = #{id}
+    </delete>
+
+    <delete id="deleteAll" parameterType="java.util.List">
+        DELETE FROM productinfo WHERE thirdProductNo in
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <update id="updateProductInfo" parameterType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        UPDATE productinfo
+        <set>
+            <if test="nameCode != null">nameCode=#{nameCode},</if>
+            <if test="packRatio != null">packRatio=#{packRatio},</if>
+            <if test="packLevel != null">packLevel=#{packLevel},</if>
+            <if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
+            <if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
+            <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
+            <if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
+            <if test="bzcj != null">bzcj=#{bzcj},</if>
+            <if test="thirdProductNo != null">thirdProductNo=#{thirdProductNo},</if>
+            <if test="addType != null">addType=#{addType},</if>
+            <if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
+            <if test="isUseDy != null">isUseDy=#{isUseDy},</if>
+            <if test="thirdProductName != null">thirdProductName=#{thirdProductName},</if>
+            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
+            <if test="cplb != null">cplb=#{cplb},</if>
+            <if test="flbm != null">flbm=#{flbm},</if>
+            <if test="ggxh != null">ggxh=#{ggxh},</if>
+            <if test="qxlb != null">qxlb=#{qxlb},</if>
+            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+            <if test="uuid != null">uuid=#{uuid},</if>
+            <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
+            <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
+            <if test="diType != null">diType=#{diType},</if>
+            <if test="isNewest != null">isNewest=#{isNewest},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateProductByUuid" parameterType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
+        UPDATE productinfo
+        <set>
+            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
+            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
+            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
+            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
+            <if test="ybbm != null">ybbm=#{ybbm},</if>
+            <if test="spmc != null">spmc=#{spmc},</if>
+            <if test="cphhhbh != null">cphhhbh=#{cphhhbh},</if>
+            <if test="cpms != null">cpms=#{cpms},</if>
+            <if test="cpbsbmtxmc != null">cpbsbmtxmc=#{cpbsbmtxmc},</if>
+            <if test="isNewest != null">isNewest=#{isNewest},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+        </set>
+        WHERE uuid = #{uuid}
+    </update>
+
+
+    <!--测试专用-->
+    <select id="findAllUuids" parameterType="com.glxp.sale.admin.req.ListPageRequest" resultType="java.lang.String">
+        SELECT uuid
+        from device
+        group by uuid limit #{page}, #{limit}
+    </select>
+    <select id="findAllTyshxyh" resultType="java.lang.String">
+        SELECT tyshxydm
+        from productinfo
+        group by tyshxydm
+    </select>
+</mapper>

api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml

@@ -0,0 +1,109 @@
+<?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.sale.admin.dao.basic.UdiCompanyDao">
+
+    <select id="selectAllTyshxyh"
+            resultType="com.glxp.sale.admin.entity.basic.UdiCompanyEntity">
+        SELECT deviceRecordKey, tyshxydm, ylqxzcrbarmc, ylqxzcrbarywmc
+        FROM device
+        GROUP BY tyshxydm
+
+    </select>
+
+    <select id="selectContactBykey" parameterType="Map"
+            resultType="com.glxp.sale.admin.entity.udid.Contactlist">
+        SELECT qylxrdh, qylxryx, qylxrcz
+        from contactlist
+        WHERE deviceRecordKey = #{deviceRecordKey}
+    </select>
+
+    <select id="filterUdiCompany"
+            parameterType="com.glxp.sale.admin.req.basic.UdiCompanyRequest"
+            resultType="com.glxp.sale.admin.entity.basic.UdiCompanyEntity">
+        SELECT * FROM udicompany
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm =#{tyshxydm}
+            </if>
+            <if test="provinceCode != '' and provinceCode != null">
+                AND SUBSTRING(tyshxydm,3,2) = #{provinceCode}
+            </if>
+            <if test="cityCode != '' and cityCode != null">
+                AND SUBSTRING(tyshxydm,3,4) = #{cityCode}
+            </if>
+            <if test="areaCode != '' and areaCode != null">
+                AND SUBSTRING(tyshxydm,3,6) = #{areaCode}
+            </if>
+        </where>
+
+    </select>
+
+
+    <insert id="insertUdiCompany" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiCompanyEntity">
+        REPLACE
+        INTO udicompany
+        (
+        id,tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh,
+        qylxrcz,qylxryx
+        )
+        values
+        (
+        #{id},
+        #{tyshxydm},
+        #{ylqxzcrbarmc},
+        #{ylqxzcrbarywmc},
+        #{qylxrdh},
+        #{qylxrcz},
+        #{qylxryx}
+        )
+    </insert>
+
+    <insert id="insertUdiCompanys" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiCompanyEntity">
+        replace INTO udicompany(id,
+        tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh,
+        qylxrcz,qylxryx)
+        values
+        <foreach collection="udiCompanyEntities" item="item" index="index"
+                 separator=",">
+
+            (
+            #{item.id},
+            #{item.tyshxydm},
+            #{item.ylqxzcrbarmc},
+            #{item.ylqxzcrbarywmc},
+            #{item.qylxrdh},
+            #{item.qylxrcz},
+            #{item.qylxryx})
+        </foreach>
+
+    </insert>
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM udicompany
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteAll" parameterType="java.util.List">
+        DELETE FROM udicompany WHERE id in
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <update id="updateUdiCompany" parameterType="com.glxp.sale.admin.entity.basic.UdiCompanyEntity">
+        UPDATE udicompany
+        <set>
+            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+            <if test="qylxrdh != null">qylxrdh=#{qylxrdh},</if>
+            <if test="qylxrcz != null">qylxrcz=#{qylxrcz},</if>
+            <if test="qylxryx != null">qylxryx=#{qylxryx},</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+</mapper>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml

@@ -0,0 +1,194 @@
+<?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.sale.admin.dao.thrsys.ThrProductsAddDao">
+
+    <select id="filterThrProductsRequest" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest"
+            resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
+        SELECT * FROM thr_products_add
+        <where>
+            <if test="name != '' and name != null">
+                AND name LIKE concat('%',#{name},'%')
+            </if>
+            <if test="code != '' and code != null">
+                AND code LIKE concat('%',#{code},'%')
+            </if>
+            <if test="registerNo != '' and registerNo != null">
+                AND registerNo LIKE concat('%',#{registerNo},'%')
+            </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND manufactory LIKE concat('%',#{manufactory},'%')
+            </if>
+            <if test="spec != '' and spec != null">
+                AND spec LIKE concat('%',#{spec},'%')
+            </if>
+
+            <if test="supName != '' and supName != null">
+                AND supName LIKE concat('%',#{supName},'%')
+            </if>
+            <if test="unionCode != '' and unionCode != null">
+                or code LIKE concat('%',#{unionCode},'%') or sptm LIKE concat('%',#{unionCode},'%') or ybbm LIKE
+                concat('%',#{unionCode},'%')
+            </if>
+
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
+            <if test="checkStatus != '' and checkStatus != null">
+                AND checkStatus = #{checkStatus}
+            </if>
+            <if test="customerId != '' and customerId != null">
+                AND customerId = #{customerId}
+            </if>
+
+        </where>
+        ORDER BY updateTime DESC
+    </select>
+
+
+    <select id="selectThrProducts" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest"
+            resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
+        SELECT * FROM thr_products_add
+        <where>
+            <if test="name != '' and name != null">
+                AND name =#{name}
+            </if>
+            <if test="code != '' and code != null">
+                AND code =#{code}
+            </if>
+            <if test="registerNo != '' and registerNo != null">
+                AND registerNo=#{registerNo}
+            </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND manufactory=#{manufactory}
+            </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
+            <if test="checkStatus != '' and checkStatus != null">
+                AND checkStatus = #{checkStatus}
+            </if>
+            <if test="customerId != '' and customerId != null">
+                AND customerId = #{customerId}
+            </if>
+        </where>
+        ORDER BY updateTime DESC
+    </select>
+
+
+    <select id="batchSelectByIds" resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
+        select *
+        from thr_products_add where code in
+        <foreach collection="codes" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and thirdSysFk = #{thirdSysFk}
+    </select>
+
+
+    <select id="selectById" parameterType="Map" resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
+        select *
+        FROM thr_products_add
+        WHERE id = #{id}
+    </select>
+
+    <insert id="insertThrProducts" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
+        replace
+        INTO thr_products_add
+        (
+        code,name,measname,spec,registerNo,manufactory,
+        cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms,
+        thirdSysFk,updateTime,supName,checkStatus,customerId
+        )
+        values
+            (
+        #{code},
+        #{name},
+        #{measname},
+        #{spec},
+        #{registerNo},
+        #{manufactory},
+        #{cplb},
+        #{flbm},
+        #{qxlb},
+        #{ybbm},
+        #{sptm},
+        #{tyshxydm},
+        #{zczbhhzbapzbh},
+        #{ylqxzcrbarmc},
+        #{ylqxzcrbarywmc},
+        #{cpms},
+        #{thirdSysFk},
+        #{updateTime},
+        #{supName},
+        #{checkStatus},
+        #{customerId}
+        )
+    </insert>
+
+    <insert id="insertThrProductss" keyProperty="id" parameterType="java.util.List">
+        replace INTO thr_products_add
+        (
+        code,name,measname,spec,registerNo,manufactory,
+        cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms,
+        thirdSysFk,updateTime,supName,checkStatus,customerId
+        )
+        values
+
+        <foreach collection="thrProductsEntities" item="item" index="index"
+                 separator=",">
+            (
+            #{item.code},
+            #{item.name},
+            #{item.measname},
+            #{item.spec},
+            #{item.registerNo},
+            #{item.manufactory},
+            #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm},
+            #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms},
+            #{item.thirdSysFk},#{item.updateTime},#{item.supName}, #{tem.checkStatus}, #{tem.customerId}
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM thr_products_add
+        WHERE id = #{id}
+    </delete>
+
+    <update id="updateThrProducts" parameterType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
+        UPDATE thr_products_add
+        <trim prefix="set" suffixOverrides=",">
+            <if test="code != null">code=#{code},</if>
+            <if test="name != null">name=#{name},</if>
+            <if test="measname != null">measname=#{measname},</if>
+            <if test="spec != null">spec=#{spec},</if>
+            <if test="registerNo != null">registerNo=#{registerNo},</if>
+            <if test="cplb != null">cplb=#{cplb},</if>
+            <if test="flbm != null">flbm=#{flbm},</if>
+            <if test="qxlb != null">qxlb=#{qxlb},</if>
+            <if test="ybbm != null">ybbm=#{ybbm},</if>
+            <if test="sptm != null">sptm=#{sptm},</if>
+            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+            <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
+            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+            <if test="manufactory != null">manufactory=#{manufactory},</if>
+            <if test="cpms != null">cpms=#{cpms},</if>
+            <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="supName != null">supName=#{supName},</if>
+            <if test="checkStatus != null">checkStatus=#{checkStatus},</if>
+            <if test="customerId != null">customerId=#{customerId},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteAll">
+        DELETE
+        FROM thr_products_add
+    </delete>
+
+</mapper>