diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskData.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskData.java index 5f82251c..d5bfa0a3 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskData.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskData.java @@ -27,4 +27,6 @@ public class BusinessRiskData extends BaseEntity { private String removeDecisionOffice; //企业时间Sid private String buSid; + private String businessName; + private String executionTime; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataDto.java index abe70689..af57dc49 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataDto.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataDto.java @@ -26,7 +26,4 @@ public class BusinessRiskDataDto implements Dto { private String removeDecisionOffice; //企业时间Sid private String buSid; - - //状态码 - private String Status; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDate.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDate.java index 3a719e96..164c41f9 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDate.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDate.java @@ -1,12 +1,10 @@ package com.supervise.rms.api.businessriskdate; import com.baomidou.mybatisplus.annotation.TableName; -import com.supervise.rms.api.businessriskdata.BusinessRiskDataDto; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import lombok.Data; -import java.util.List; /** * @author feikefei @@ -18,5 +16,14 @@ import java.util.List; public class BusinessRiskDate extends BaseEntity { private String executionTime; private String businessName; - private List dataList; + private String OrderNumber; + private String verifyResult; + + private String addDate; + private String addReason; + private String buSid; + private String decisionOffice; + private String removeDate; + private String romoveReason; + private String removeDecisionOffice; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDateDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDateDto.java index 2f4713f1..5ed5d658 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDateDto.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDateDto.java @@ -5,6 +5,7 @@ import com.yxt.common.core.dto.Dto; import lombok.Data; import java.util.List; +import java.util.Map; /** * @author feikefei @@ -16,5 +17,7 @@ public class BusinessRiskDateDto implements Dto { private String sid; private String executionTime; private String businessName; - private List dataList; + private String OrderNumber; + private String verifyResult; + private Map Result; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/pusinformation/PushInformation.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/pusinformation/PushInformation.java new file mode 100644 index 00000000..46520edb --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/pusinformation/PushInformation.java @@ -0,0 +1,28 @@ +package com.supervise.rms.api.pusinformation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-06-09-10:53 + */ +@Data +@ApiModel(value = "推送信息表", description = "推送信息表") +@TableName("push_information") +public class PushInformation extends BaseEntity { + //企业名称 + private String enterpriseName; + //联系人 + private String contacts; + //电话 + private String telephone; + //微信公众号唯一标识 + private String openId; + //银行账号 + private String bankAccount; + //开户行 + private String openingBankName; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.java index b69d4f0c..dfbf5210 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.java @@ -8,6 +8,9 @@ import com.supervise.rms.api.businessriskdata.BusinessRiskData; import com.supervise.rms.api.businessriskdata.BusinessRiskDataVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author feikefei @@ -17,4 +20,12 @@ import org.apache.ibatis.annotations.Param; public interface BusinessRiskDataMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Select("select e.businessName,e.executionTime,a.*\n" + + " from business_risk_date e\n" + + " left join business_risk_data a on e.sid = a.buSid") + List selectBusinessRiskDataList(); + + @Select("select * from business_risk_data where buSid = #{sid}") + List selectBusinessRiskData(@Param("sid") String sid); } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java index 7bb0f105..0086aec1 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java @@ -15,6 +15,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author feikefei * @create 2023-06-06-15:48 @@ -24,7 +26,7 @@ public class BusinessRiskDataService extends MybatisBaseService vo = PagerUtil.pageToVo(iPage, null); return vo; } + + public List selectBusinessRiskDataList(){ + return baseMapper.selectBusinessRiskDataList(); + } + + public List selectBusinessRiskData(String sid){ + return baseMapper.selectBusinessRiskData(sid); + } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java index 0ebe6303..7ff77026 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java @@ -3,6 +3,10 @@ package com.supervise.rms.biz.businessriskdate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.supervise.rms.api.businessriskdate.BusinessRiskDate; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author feikefei @@ -10,4 +14,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface BusinessRiskDateMapper extends BaseMapper { + @Select("select e.*,a.addDate,a.addReason,a.buSid,a.decisionOffice,a.removeDate,a.romoveReason," + + "a.removeDecisionOffice from business_risk_date e right join business_risk_data a on e.sid = a.buSid" + + " where businessName = #{name} order by e.executionTime desc") + List selectBusinessRiskDateByName(@Param("name") String name); } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java index 01c3eff7..7c4c6c3f 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @author feikefei @@ -27,10 +28,27 @@ public class BusinessRiskDateService extends MybatisBaseService dataList = dto.getDataList(); - for (BusinessRiskDataDto businessRiskDataDto : dataList) { - businessRiskDataDto.setBuSid(date.getSid()); - businessRiskDataService.save(businessRiskDataDto); + Map result = dto.getResult(); + if (result == null){ + BusinessRiskDataDto dto1 = new BusinessRiskDataDto(); + dto1.setBuSid(date.getSid()); + businessRiskDataService.save(dto1); + }else { + List dataList = (List)result.get("Data"); + if (dataList == null || dataList.size() == 0){ + BusinessRiskDataDto dto1 = new BusinessRiskDataDto(); + dto1.setBuSid(date.getSid()); + businessRiskDataService.save(dto1); + }else { + for (BusinessRiskDataDto businessRiskDataDto : dataList) { + businessRiskDataDto.setBuSid(date.getSid()); + businessRiskDataService.save(businessRiskDataDto); + } + } } } + + public List selectBusinessRiskDateByName(String name){ + return baseMapper.selectBusinessRiskDateByName(name); + } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationMapper.java new file mode 100644 index 00000000..e2ffa1e7 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationMapper.java @@ -0,0 +1,19 @@ +package com.supervise.rms.biz.pusinformation; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervise.rms.api.pusinformation.PushInformation; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author feikefei + * @create 2023-06-09-10:59 + */ +@Mapper +public interface PushInformationMapper extends BaseMapper { + + @Select("select * from push_information") + List selectPushInformationList(); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationRest.java new file mode 100644 index 00000000..b7a72813 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationRest.java @@ -0,0 +1,15 @@ +package com.supervise.rms.biz.pusinformation; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author feikefei + * @create 2023-06-09-10:53 + */ +@RestController +@Api(tags = "消息推送信息表") +@RequestMapping("v1/pushInformat") +public class PushInformationRest { +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationService.java new file mode 100644 index 00000000..6af9177f --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/pusinformation/PushInformationService.java @@ -0,0 +1,21 @@ +package com.supervise.rms.biz.pusinformation; + +import com.supervise.rms.api.pusinformation.PushInformation; +import com.yxt.common.base.service.MybatisBaseService; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author feikefei + * @create 2023-06-09-10:58 + */ +@Service +public class PushInformationService extends MybatisBaseService { + + + public List selectPushInformationList(){ + return baseMapper.selectPushInformationList(); + }; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/QichachaConfig.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/QichachaConfig.java index 4d3a4af3..09a7ecba 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/QichachaConfig.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/QichachaConfig.java @@ -26,6 +26,7 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -40,6 +41,7 @@ import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author feikefei @@ -54,9 +56,12 @@ public class QichachaConfig { @Autowired private BusinessRiskDateService businessRiskDateService; - public static String APPkey = "9214e7ce4a3a483c8c115771a5f018e1"; - private static final String secretKey = "5827FC97C3DBFBC28444ADD3949C6FD4"; - public static String URL = "https://api.qichacha.com/ExceptionCheck/GetList"; + @Value("${qichacha.appKey}") + private String APPkey; + @Value("${qichacha.secretKey}") + private String secretKey; + @Value("${qichacha.URL}") + private String URL; //设置连接超时时间,单位毫秒。 public final static int CONNECT_TIMEOUT = 30000; @@ -66,34 +71,34 @@ public class QichachaConfig { public final static int SOCKET_TIMEOUT = 30000; //每周日凌晨1点执行 - @Scheduled(cron = "0 0 1 ? * 1") +// @Scheduled(cron = "0 0 1 ? * 1") public void enterpriseRiskInquiry(){ -// String currDay = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd"); -// List list = enterpriseInformationService.enterpriseInformationList(); -// for (EnterpriseInformation enterpriseInformation : list) { -// String paramStr = "searchKey=" + enterpriseInformation.getEnterpriseName(); -// String status = ""; -// try { -// HttpHead reqHeader = new HttpHead(); -// String[] autherHeader = RandomAuthentHeader(); -// reqHeader.setHeader("Token", autherHeader[0]); -// reqHeader.setHeader("Timespan", autherHeader[1]); -// final String reqUri = URL.concat("?key=").concat(APPkey).concat("&").concat(paramStr); -// String tokenJson = httpGet(reqUri, reqHeader.getAllHeaders()); -// System.out.println(String.format("==========================>this is response:{%s}", tokenJson)); -// status = FormartJson(tokenJson, "Status"); -// System.out.println(String.format("==========================>Status:{%s}", status)); -// BusinessRiskDateDto businessRiskDate = new BusinessRiskDateDto(); -// businessRiskDate.setExecutionTime(currDay); -// businessRiskDate.setBusinessName(enterpriseInformation.getEnterpriseName()); -// //// TODO: 2023/6/7 -//// businessRiskData.setBuSid(businessRiskDate.getSid()); -//// businessRiskDate.setDataList(); -// businessRiskDateService.save(businessRiskDate); -// }catch (Exception e){ -// e.printStackTrace(); -// } -// } + String currDay = DateUtil.format(new Date(), "yyyy-MM-dd"); + List list = enterpriseInformationService.enterpriseInformationList(); + for (EnterpriseInformation enterpriseInformation : list) { + String paramStr = "searchKey=" + enterpriseInformation.getEnterpriseName(); + try { + HttpHead reqHeader = new HttpHead(); + String[] autherHeader = RandomAuthentHeader(); + reqHeader.setHeader("Token", autherHeader[0]); + reqHeader.setHeader("Timespan", autherHeader[1]); + final String reqUri = URL.concat("?key=").concat(APPkey).concat("&").concat(paramStr); + String tokenJson = httpGet(reqUri, reqHeader.getAllHeaders()); + System.out.println(String.format("==========================>this is response:{%s}", tokenJson)); + BusinessRiskDateDto businessRiskDateDto = FormartJson(tokenJson); + businessRiskDateDto.setBusinessName(enterpriseInformation.getEnterpriseName()); + businessRiskDateDto.setExecutionTime(currDay); + Map result = businessRiskDateDto.getResult(); + if (result == null){ + businessRiskDateDto.setVerifyResult("0"); + }else { + businessRiskDateDto.setVerifyResult(businessRiskDateDto.getResult().get("VerifyResult").toString()); + } + businessRiskDateService.save(businessRiskDateDto); + }catch (Exception e){ + e.printStackTrace(); + } + } } public static void main(String[] args) throws Exception { @@ -144,40 +149,35 @@ public class QichachaConfig { // } // System.out.println("************-----------****************"); // System.out.println(body); - String paramStr = "searchKey=石家庄瀚川商贸有限公司"; - String status = ""; +// String paramStr = "searchKey=石家庄瀚川商贸有限公司"; try { - HttpHead reqHeader = new HttpHead(); - String[] autherHeader = RandomAuthentHeader(); - reqHeader.setHeader("Token", autherHeader[0]); - reqHeader.setHeader("Timespan", autherHeader[1]); - final String reqUri = URL.concat("?key=").concat(APPkey).concat("&").concat(paramStr); - String tokenJson = httpGet(reqUri, reqHeader.getAllHeaders()); - System.out.println(String.format("==========================>this is response:{%s}", tokenJson)); - - status = FormartJson(tokenJson, "Status"); - System.out.println(String.format("==========================>Status:{%s}", status)); +// HttpHead reqHeader = new HttpHead(); +// String[] autherHeader = RandomAuthentHeader(); +// reqHeader.setHeader("Token", autherHeader[0]); +// reqHeader.setHeader("Timespan", autherHeader[1]); +// final String reqUri = URL.concat("?key=").concat(APPkey).concat("&").concat(paramStr); +// String tokenJson = httpGet(reqUri, reqHeader.getAllHeaders()); +// System.out.println(String.format("==========================>this is response:{%s}", tokenJson)); +// +// BusinessRiskDateDto businessRiskDateDto = FormartJson(tokenJson); }catch (Exception e){ e.printStackTrace(); } } // 获取Auth Code - protected static final String[] RandomAuthentHeader() { + protected final String[] RandomAuthentHeader() { String timeSpan = String.valueOf(System.currentTimeMillis() / 1000); String[] authentHeaders = new String[] { DigestUtils.md5Hex(APPkey.concat(timeSpan).concat(secretKey)).toUpperCase(), timeSpan }; return authentHeaders; } // 解析JSON - protected static String FormartJson(String jsonString, String key) throws JSONException { + // 解析JSON + protected static BusinessRiskDateDto FormartJson(String jsonString) throws JSONException { JSONObject jObject = new JSONObject(jsonString); - BusinessRiskDataDto businessRiskDataDto = jObject.toBean(BusinessRiskDataDto.class); - -// Gson gson = new Gson(); -// List businessRiskDataDto = gson.fromJson(jsonString, List.class); -// List riskDataDto = JSON.parseArray(jsonString, BusinessRiskDataDto.class); - return (String) jObject.get(key); + BusinessRiskDateDto businessRiskDateDto = jObject.toBean(BusinessRiskDateDto.class); + return businessRiskDateDto; } public static String httpGet(String url, Header[] headers) throws Exception { diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml index 653c6547..7400ec33 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml @@ -29,3 +29,13 @@ image: url: prefix: http://127.0.0.1:8112/upload/ +wechat: + appId: wx1d44e0fcd110351a #本地wx0f6062989ab28c91 + sppSecret: 4764e32722a7d98656dea6afd9405701 #本地c4d7fc22a9bd39efd9dbeedcf94a9d88 + WX_URL_MESSAGE_SEND: https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN + WX_URL_ACCESS_TOKEN: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET + +qichacha: + appKey: 53c10aed6dbd46ae89ee86c6bd50936e + secretKey: 22A9A561A7EDEDFB0F3C432258BDC280 + URL: https://api.qichacha.com/ExceptionCheck/GetList \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml index 3000be33..7fe1ce0c 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml @@ -2,8 +2,8 @@ spring: application: name: supervise-rms profiles: -# active: devv - active: test + active: devv +# active: test messages: # 国际化资源文件路径 basename: i18n/messages @@ -16,6 +16,8 @@ spring: restart: # 热部署开关 enabled: true + main: + allow-bean-definition-overriding: true