diff --git a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java index 43154da3a..281d50b1d 100644 --- a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java +++ b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java @@ -12,6 +12,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; +import java.util.Date; public class ImgYwsqhUtil { @@ -60,52 +61,60 @@ public class ImgYwsqhUtil { if(contact_name.length() == 2){ contact_name = contact_name.replace("", " ").trim(); } - int xName = 1496 - metrics.stringWidth(contact_name)/2 ; - g.drawString(contact_name, xName , 654);//g.drawString(文字, x 位置, y 位置); + int xName = 1496/2 - metrics.stringWidth(contact_name)/2 ; + g.drawString(contact_name, xName , 805);//g.drawString(文字, x 位置, y 位置); } //图片加身份证号 if(StringUtils.isNotBlank(contact_id_number)){ - int xNumber = 605 - metrics.stringWidth(contact_id_number) / 2; - g.drawString(contact_id_number, xNumber, 764); + int xNumber = 700*2 - metrics.stringWidth(contact_id_number) / 2; + g.drawString(contact_id_number, xNumber, 805); } //图片加部门 if(StringUtils.isNotBlank(contact_department)){ - int xDepartment = 1180 - metrics.stringWidth(contact_department) / 2; - g.drawString(contact_department, xDepartment, 764); + int xDepartment = 1180/2 - metrics.stringWidth(contact_department) / 2; + g.drawString(contact_department, xDepartment, 920); } //图片加职务 if(StringUtils.isNotBlank(contact_job)){ - int xJob = 1562 - metrics.stringWidth(contact_job) / 2; - g.drawString(contact_job, xJob, 764); + int xJob = 2100/2 - metrics.stringWidth(contact_job) / 2; + g.drawString(contact_job, xJob, 920); } //图片加法人姓名 if(StringUtils.isNotBlank(legal_person)){ if(legal_person.length() == 2){ legal_person = legal_person.replace("", " ").trim(); } - g.drawString(legal_person, 630, 1315); + g.drawString(legal_person, 630, 1470); } //图片加法人身份证号 if(StringUtils.isNotBlank(id_card_number)){ - g.drawString(id_card_number, 550, 1425); + g.drawString(id_card_number, 580, 1585); } //图片加有效期 - if(StringUtils.isNotBlank(card_period_begin) && StringUtils.isNotBlank(card_period_end)){ - String card_begin_end = card_period_begin + " 至 " + card_period_end; - g.drawString(card_begin_end, 594, 1535); - } +// if(StringUtils.isNotBlank(card_period_begin) && StringUtils.isNotBlank(card_period_end)){ +// String card_begin_end = card_period_begin + " 至 " + card_period_end; +// g.drawString(card_begin_end, 594, 1535); +// } //图片加商户/单位名称merchant_name if(StringUtils.isNotBlank(merchant_name)){ - g.drawString(merchant_name, 1214, 2306); + g.drawString(merchant_name, 1290, 2020); } //无公章 if(!isSeal){ Color sealColor = Color.LIGHT_GRAY; g.setColor(sealColor); - g.drawString("无公章", 1214, 2194); + g.drawString("无公章", 1300, 2130); } + //日期 + g.setColor(myColorTxtBottom); + String currdatestr = DateUtils.format(new Date(),"yyyy-M-d"); + String[] currdates = currdatestr.split("-"); + g.drawString(currdates[0], 1100, 2240); + g.drawString(currdates[1], 1280, 2240); + g.drawString(currdates[2], 1400, 2240); + //调这个方法就是开始这个整合 (可以多张图片,多个文字整合成一张图片,只有把他们放在这方法里面就行) g.dispose(); // logger.info("starttime4----"+new Date().getTime()); @@ -124,11 +133,11 @@ public class ImgYwsqhUtil { } public static void main(String[] args) { - String serverUploadImgUrl = "C:/Users/xiaohu/Desktop/img"; // 图片保存路径 + String serverUploadImgUrl = "C:/"; // 图片保存路径 try { byte[] bytes = imgCeate("周思琦","421302199908031245","运营部","经理", "王若非","612101194701250412","2007-10-29","长期", - false,"北京富茂科技有限公司"); + true,"北京富茂科技有限公司"); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); BufferedImage bi1 =ImageIO.read(bais); @@ -138,5 +147,6 @@ public class ImgYwsqhUtil { e.printStackTrace(); } System.out.println("结束"); + } } diff --git a/mallinkBApi/src/main/resources/imgTemp/wxjjywsqh.jpg b/mallinkBApi/src/main/resources/imgTemp/wxjjywsqh.jpg index 3e3e9e46d..368af30b8 100644 Binary files a/mallinkBApi/src/main/resources/imgTemp/wxjjywsqh.jpg and b/mallinkBApi/src/main/resources/imgTemp/wxjjywsqh.jpg differ diff --git a/mallinkBApi/src/main/resources/imgTemp/wxjjywsqh1.jpg b/mallinkBApi/src/main/resources/imgTemp/wxjjywsqh1.jpg new file mode 100644 index 000000000..3e3e9e46d Binary files /dev/null and b/mallinkBApi/src/main/resources/imgTemp/wxjjywsqh1.jpg differ diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv2/HaiKangWeiShiV2Util.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv2/HaiKangWeiShiV2Util.java index a9943ac0f..891f1749b 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv2/HaiKangWeiShiV2Util.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv2/HaiKangWeiShiV2Util.java @@ -44,10 +44,10 @@ import java.util.*; @Slf4j public class HaiKangWeiShiV2Util { - public static final String TOKEN_URL = "https://open.hikyun.com/artemis/oauth/token"; - public static final String QUERY_PRICE = "https://open.hikyun.com/artemis/api/v1/charge/getParkingPaymentInfo"; - public static final String COUPON_USE = "https://open.hikyun.com/artemis/api/v1/sendCoupon"; - public static final String NOTIFY_PAID = "https://open.hikyun.com/artemis/api/v1/charge/payment/notice"; + public static final String TOKEN_URL = "http://api.hikparking.com:9016/artemis/oauth/token"; + public static final String QUERY_PRICE = "http://api.hikparking.com:9016/artemis/api/v1/charge/getParkingPaymentInfo"; + public static final String COUPON_USE = "http://api.hikparking.com:9016/artemis/api/v1/sendCoupon"; + public static final String NOTIFY_PAID = "http://api.hikparking.com:9016/artemis/api/v1/charge/payment/notice"; /** * @description UTC时间转化为本地时间