diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/InvoiceQueryController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/InvoiceQueryController.java index bc794ea9..b8fb5acb 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/InvoiceQueryController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/InvoiceQueryController.java @@ -1,10 +1,13 @@ package com.dxhy.core.controller; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; import javax.annotation.Resource; +import com.dxhy.core.job.entity.TAcOrg; +import com.dxhy.core.job.service.InvoiceInterfaceService; +import com.dxhy.core.job.service.SupplierRiskService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -36,6 +39,12 @@ public class InvoiceQueryController extends AbstractController { @Resource private CoreInvoiceQueryService coreInvoiceQueryService; + @Resource + SupplierRiskService supplierRiskService; + + @Resource + InvoiceInterfaceService invoiceInterfaceService; + /** * 扫码查验发票 * @@ -111,4 +120,40 @@ public class InvoiceQueryController extends AbstractController { } } + /** + * 扫码查验发票 + * + * @return + * + */ + @PostMapping("/smcy/supplier") + @ResponseBody + @SysLog("供应商风险") + public String supplierRisk(@RequestBody Map pramsMap) { + + Map data = new HashMap<>(16); + data.put("dbName", getUserInfo().getDbName()); + data.put("business", getUserInfo().getBusiness()); + List gfshList = new ArrayList<>(); + if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { + gfshList.add(pramsMap.get("gfsh").toString()); + } else { + gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (gfshList.size() == 0) { + return ""; + } + } + data.put("gfsh", gfshList); + data.put("taxNo", pramsMap.get("taxNo")); + data.put("taxName", pramsMap.get("taxName")); + // 设置日期格式 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String date = df.format(new Date()); + data.put("currentTime", date); + + String riskSupplierVOS = supplierRiskService.selectRiskSupplier2(data); + return riskSupplierVOS; + + } + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/entity/SNSAPObject.java b/dxhy-core/src/main/java/com/dxhy/core/job/entity/SNSAPObject.java index 2721693c..09d018ed 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/entity/SNSAPObject.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/entity/SNSAPObject.java @@ -73,6 +73,6 @@ public class SNSAPObject { * 外围系统标识 */ @JSONField(name = "ZDATA") - private List ZDATA; + private String ZDATA; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/SupplierRiskHandle.java b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/SupplierRiskHandle.java index c3303853..887b2372 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/SupplierRiskHandle.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/SupplierRiskHandle.java @@ -36,9 +36,6 @@ public class SupplierRiskHandle extends Thread { @Override public void run() { - - - supplierRiskService = (SupplierRiskService)SpringContextUtils.getBean("SupplierRiskService"); String riskSupplierVOS = supplierRiskService.selectRiskSupplier2(pramsMap); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java index 663b4212..6ac1c0d9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java @@ -9,6 +9,7 @@ import com.dxhy.common.service.TabulateRedisService; import com.dxhy.common.service.impl.MpBaseServiceImpl; import com.dxhy.common.util.AmountFormatUtil; import com.dxhy.common.util.MathUtil; +import com.dxhy.common.util.UserInfoUtil; import com.dxhy.common.vo.DictdetaModel; import com.dxhy.core.dao.ViolationLogDao; import com.dxhy.core.entity.EnterpriseInfoModel; @@ -36,7 +37,7 @@ import java.util.*; * @date 2020/12/31 */ @Slf4j -@Service +@Service("SupplierRiskService") public class SupplierRiskServiceImpl extends MpBaseServiceImpl implements SupplierRiskService { @@ -150,11 +151,14 @@ public class SupplierRiskServiceImpl extends MpBaseServiceImpl pramsMap) { + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); //获取购方税号对应的供应商风险信息 String result = ""; + log.info("请求供应商风险的参数为:{}",pramsMap); List pageList = super.baseMapper.selectRiskSupplier(pramsMap); + log.info("pageList:{}",pageList); for (RiskSupplierVO risk : pageList) { String taxNo = risk.getTaxNo(); Map prams = new HashMap<>(); @@ -162,6 +166,7 @@ public class SupplierRiskServiceImpl extends MpBaseServiceImpl violationLogModels = super.baseMapper.selectRiskSupplierInfo(prams); + log.info("返回违规信息为:{}",violationLogModels); //构建FI870参数 SNSAPObject object = new SNSAPObject(); object.setSYSID("FPXT"); @@ -169,7 +174,7 @@ public class SupplierRiskServiceImpl extends MpBaseServiceImpl risks = new ArrayList<>(); + List risks = new ArrayList<>(); if (violationLogModels != null && violationLogModels.size() > 0) { for (ViolationLogModel violation : violationLogModels) { @@ -180,19 +185,18 @@ public class SupplierRiskServiceImpl extends MpBaseServiceImpl list = invoiceInterfaceService.getTaxnoForQpm(); + log.info("当前企业为:{}", JSONObject.toJSONString(list)); if(list != null && list.size()>0) { ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, 60L, - TimeUnit.SECONDS, new LinkedBlockingQueue(list.size() * 4), + TimeUnit.SECONDS, new LinkedBlockingQueue( 4), r -> new Thread(r, "获取供应商风险-" + r.hashCode())); - for(TAcOrg org : list) { - Map request = new HashMap<>(); - if (!threadPoolExecutor.isShutdown()) { - threadPoolExecutor.execute(new SupplierRiskHandle(request)); - } + + Map data = new HashMap<>(16); + data.put("dbName", "business"); + List gfshList = new ArrayList<>(); + for(TAcOrg org:list){ + gfshList.add(org.getTaxno()); + } + data.put("gfsh", gfshList); + data.put("taxNo", ""); + data.put("taxName", ""); + // 设置日期格式 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String date = df.format(new Date()); + data.put("currentTime", date); + + log.info("请求供应商风险的参数为:{}",data); + + if (!threadPoolExecutor.isShutdown()) { + threadPoolExecutor.execute(new SupplierRiskHandle(data)); } threadPoolExecutor.shutdown(); diff --git a/dxhy-core/src/main/resources/mapper/ExtViolationLogMapper.xml b/dxhy-core/src/main/resources/mapper/ExtViolationLogMapper.xml index de469f78..58a6ef6a 100644 --- a/dxhy-core/src/main/resources/mapper/ExtViolationLogMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtViolationLogMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select DISTINCT t.id,t.xf_tax_no,t.penalize_date,t.break_law_type,t.break_law_method,t.input_date,d.xf_name from t_dx_violation_taxno d right join t_dx_violation_log t on d.xf_tax_no=t.xf_tax_no where d.company=#{company}