Skip to content

夏齐 / hzbdcsyn

Go to a project
Toggle navigation
Toggle navigation pinning
040fbf90 by 夏齐
Options

首次提交

1 parent 4e277aa8
Inline Side-by-side
Showing 8 changed files with 194 additions and 103 deletions
...@@ -140,7 +140,7 @@ public class EciHttpUtil { ...@@ -140,7 +140,7 @@ public class EciHttpUtil {
140 * @param documentId 合同文档ID 140 * @param documentId 合同文档ID
141 * @return 141 * @return
142 */ 142 */
143 public String download(String documentId,String bh) { 143 public String download(String documentId,String bh,String htlx,String areacode) {
144 String url = hostUrl + "/document/download" + "?documentId=" + documentId; 144 String url = hostUrl + "/document/download" + "?documentId=" + documentId;
145 InputStream in = null; 145 InputStream in = null;
146 String absolutePath = ""; 146 String absolutePath = "";
...@@ -170,7 +170,7 @@ public class EciHttpUtil { ...@@ -170,7 +170,7 @@ public class EciHttpUtil {
170 in =conn.getInputStream(); 170 in =conn.getInputStream();
171 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy"); 171 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
172 String dateDir = simpleDateFormat.format(new Date()); 172 String dateDir = simpleDateFormat.format(new Date());
173 File savePath = new File("D:\\ECI\\" + dateDir+bh); 173 File savePath = new File("E:\\ECI\\"+areacode+"\\"+ htlx+dateDir+bh);
174 if (!savePath.exists()) { 174 if (!savePath.exists()) {
175 savePath.mkdirs(); 175 savePath.mkdirs();
176 } 176 }
......
...@@ -12,7 +12,7 @@ public class QysTask { ...@@ -12,7 +12,7 @@ public class QysTask {
12 @Autowired 12 @Autowired
13 private EciService eciService; 13 private EciService eciService;
14 14
15 @Scheduled(cron="0 0/5 * * * ?") 15 @Scheduled(cron="0 0/1 * * * ?")
16 public void accessCreateContract() { 16 public void accessCreateContract() {
17 System.out.println("===========创建合同定时任务进来了========="); 17 System.out.println("===========创建合同定时任务进来了=========");
18 eciService.accessCreateContract(); 18 eciService.accessCreateContract();
......
...@@ -16,14 +16,14 @@ public class ZhjTask { ...@@ -16,14 +16,14 @@ public class ZhjTask {
16 private ZhjDatasSynService zhjDatasSynService; 16 private ZhjDatasSynService zhjDatasSynService;
17 17
18 18
19 //@Scheduled(cron="0 0 21 * * ? ") 19 @Scheduled(cron="0 0 21 * * ? ")
20 public void execute() { 20 public void execute() {
21 System.out.println("===========每天晚上九点定时任务进来了========="); 21 System.out.println("===========每天晚上九点定时任务进来了=========");
22 zhjDatasSynService.send_bdcYwInfo(); 22 zhjDatasSynService.send_bdcYwInfo();
23 System.out.println("===========每天晚上九点定时任务走了========="); 23 System.out.println("===========每天晚上九点定时任务走了=========");
24 } 24 }
25 25
26 //@Scheduled(cron="0 0 21 ? * 2") 26 @Scheduled(cron="0 0 20 15 * ? ")
27 public void executeQyInfo() { 27 public void executeQyInfo() {
28 System.out.println("===========每天晚上九点定时任务进来了========="); 28 System.out.println("===========每天晚上九点定时任务进来了=========");
29 zhjDatasSynService.synQyInfo(); 29 zhjDatasSynService.synQyInfo();
......
...@@ -2,6 +2,7 @@ package com.pashanhoo.qys.service.impl; ...@@ -2,6 +2,7 @@ package com.pashanhoo.qys.service.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.google.zxing.EncodeHintType;
5 import com.pashanhoo.common.EciHttpUtil; 6 import com.pashanhoo.common.EciHttpUtil;
6 import com.pashanhoo.common.Result; 7 import com.pashanhoo.common.Result;
7 import com.pashanhoo.qys.entity.ElecLicenseInfoDo; 8 import com.pashanhoo.qys.entity.ElecLicenseInfoDo;
...@@ -25,6 +26,7 @@ import java.awt.image.BufferedImage; ...@@ -25,6 +26,7 @@ import java.awt.image.BufferedImage;
25 import java.io.ByteArrayOutputStream; 26 import java.io.ByteArrayOutputStream;
26 import java.io.File; 27 import java.io.File;
27 import java.io.IOException; 28 import java.io.IOException;
29 import java.math.BigDecimal;
28 import java.net.URLEncoder; 30 import java.net.URLEncoder;
29 import java.nio.file.Path; 31 import java.nio.file.Path;
30 import java.nio.file.Paths; 32 import java.nio.file.Paths;
...@@ -44,6 +46,8 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -44,6 +46,8 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
44 46
45 @Value("${app.bdcqzslc}") 47 @Value("${app.bdcqzslc}")
46 private String bdcqzslc; 48 private String bdcqzslc;
49 @Value("${app.areacode}")
50 private String areacode;
47 51
48 @Autowired 52 @Autowired
49 private RegBusBdcqzsdjxxMapper regBusBdcqzsdjxxMapper; 53 private RegBusBdcqzsdjxxMapper regBusBdcqzsdjxxMapper;
...@@ -150,7 +154,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -150,7 +154,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
150 //合同ID入库 154 //合同ID入库
151 elecLicenseInfoDo.setContractId(contractId); 155 elecLicenseInfoDo.setContractId(contractId);
152 elecLicenseInfoDo.setErr_state("0"); 156 elecLicenseInfoDo.setErr_state("0");
153 regBusBdcqzsdjxxMapper.updateBdcqzsjbxxInfo((String) jbxxmap.get("ID")); 157 if("207".equals(jbxxmap.get("DJLX"))){
158 regBusBdcqzsdjxxMapper.updateBdcqzsjbxxInfoByYwh((String) jbxxmap.get("YWH"));
159 }else{
160 regBusBdcqzsdjxxMapper.updateBdcqzsjbxxInfo((String) jbxxmap.get("ID"));
161 }
154 }else{ 162 }else{
155 elecLicenseInfoDo.setErr_state("1"); 163 elecLicenseInfoDo.setErr_state("1");
156 } 164 }
...@@ -214,7 +222,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -214,7 +222,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
214 try{ 222 try{
215 String imageurl="https://www.hzbdcdj.com/api?scene="+jbxxId+"&qlr="+ URLEncoder.encode(qlr,"UTF-8")+"&zjh="+zjh; 223 String imageurl="https://www.hzbdcdj.com/api?scene="+jbxxId+"&qlr="+ URLEncoder.encode(qlr,"UTF-8")+"&zjh="+zjh;
216 logger.info("55555555============"+imageurl); 224 logger.info("55555555============"+imageurl);
217 ByteArrayOutputStream out= QRCode.from(imageurl).to(ImageType.PNG).stream(); 225 ByteArrayOutputStream out= QRCode.from(imageurl).withHint(EncodeHintType.MARGIN, 0).to(ImageType.PNG).withSize(240, 240).stream();
218 data = out.toByteArray(); 226 data = out.toByteArray();
219 }catch (Exception ex){ 227 }catch (Exception ex){
220 ex.printStackTrace(); 228 ex.printStackTrace();
...@@ -271,7 +279,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -271,7 +279,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
271 documentMap.put("qllx", map.get("QLLX")==null ? "": (String) map.get("QLLX")); 279 documentMap.put("qllx", map.get("QLLX")==null ? "": (String) map.get("QLLX"));
272 documentMap.put("qlxz", map.get("QLXZ")==null ? "": (String) map.get("QLXZ")); 280 documentMap.put("qlxz", map.get("QLXZ")==null ? "": (String) map.get("QLXZ"));
273 documentMap.put("yt", map.get("YT")==null ? "": (String) map.get("YT")); 281 documentMap.put("yt", map.get("YT")==null ? "": (String) map.get("YT"));
274 documentMap.put("mj", map.get("MJ")==null ? "": (String) map.get("MJ")); 282 documentMap.put("mj", map.get("MJ")==null ? "0"+"㎡": map.get("MJ")+"㎡");
275 documentMap.put("syqx", map.get("SYQX")==null ? "": (String) map.get("SYQX")); 283 documentMap.put("syqx", map.get("SYQX")==null ? "": (String) map.get("SYQX"));
276 documentMap.put("qlqtzk", map.get("QLQTZK")==null ? "": (String) map.get("QLQTZK")); 284 documentMap.put("qlqtzk", map.get("QLQTZK")==null ? "": (String) map.get("QLQTZK"));
277 } 285 }
...@@ -300,9 +308,12 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -300,9 +308,12 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
300 documentMap.put("qlr", map.get("QLRMC")==null ? "":(String) map.get("QLRMC")); 308 documentMap.put("qlr", map.get("QLRMC")==null ? "":(String) map.get("QLRMC"));
301 documentMap.put("zl", map.get("ZL")==null ? "":(String) map.get("ZL")); 309 documentMap.put("zl", map.get("ZL")==null ? "":(String) map.get("ZL"));
302 documentMap.put("bdcdyh", map.get("BDCDYH")==null ? "":(String) map.get("BDCDYH")); 310 documentMap.put("bdcdyh", map.get("BDCDYH")==null ? "":(String) map.get("BDCDYH"));
303 documentMap.put("fj", "业务号："+ywh); 311 if(map.get("ZTS")!=null){
312 documentMap.put("fj", "业务号："+ywh+";"+map.get("ZTS"));
313 }else{
314 documentMap.put("fj", "业务号："+ywh);
315 }
304 documentMap.put("qx", "汉台区"); 316 documentMap.put("qx", "汉台区");
305
306 String base64ewm =getBase64ewm((String) map.get("ID"),(String) map.get("QLRMC"),(String) map.get("ZJH")); 317 String base64ewm =getBase64ewm((String) map.get("ID"),(String) map.get("QLRMC"),(String) map.get("ZJH"));
307 318
308 Map ewmMap = new HashMap(); 319 Map ewmMap = new HashMap();
...@@ -388,7 +399,8 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -388,7 +399,8 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
388 try{ 399 try{
389 String documentId = waitForDownload.getDocumentId(); 400 String documentId = waitForDownload.getDocumentId();
390 String bh=waitForDownload.getZsbh(); 401 String bh=waitForDownload.getZsbh();
391 String ofdPath = eciHttpUtil.download(documentId,bh); 402 String htlx=waitForDownload.getHtlx();
403 String ofdPath = eciHttpUtil.download(documentId,bh,htlx,areacode);
392 if (StringUtils.isNotBlank(ofdPath)) { 404 if (StringUtils.isNotBlank(ofdPath)) {
393 //入库ofd文件地址 405 //入库ofd文件地址
394 waitForDownload.setSfxz("1"); 406 waitForDownload.setSfxz("1");
...@@ -412,9 +424,10 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -412,9 +424,10 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
412 String ofdPath = waitForConvert.getOfdWjdz(); 424 String ofdPath = waitForConvert.getOfdWjdz();
413 String id=waitForConvert.getDocumentId(); 425 String id=waitForConvert.getDocumentId();
414 String bh=waitForConvert.getZsbh(); 426 String bh=waitForConvert.getZsbh();
427 String htlx=waitForConvert.getHtlx();
415 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy"); 428 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
416 String dateDir = simpleDateFormat.format(new Date()); 429 String dateDir = simpleDateFormat.format(new Date());
417 String url=ofdToImg(ofdPath,"D:\\ECI\\"+ dateDir+bh+"\\",id); 430 String url=ofdToImg(ofdPath,"E:\\ECI\\"+areacode+"\\"+ htlx+dateDir+bh+"\\",id);
418 if(StringUtils.isNotBlank(url)){ 431 if(StringUtils.isNotBlank(url)){
419 waitForConvert.setSfzh("1"); 432 waitForConvert.setSfzh("1");
420 waitForConvert.setJpgWjdz(url); 433 waitForConvert.setJpgWjdz(url);
...@@ -468,37 +481,47 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -468,37 +481,47 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
468 public List<Map> assemblyInfo(){ 481 public List<Map> assemblyInfo(){
469 List<Map> oldlist=regBusBdcqzsdjxxMapper.getBdcqzsjbxxInfo(); 482 List<Map> oldlist=regBusBdcqzsdjxxMapper.getBdcqzsjbxxInfo();
470 List<Map> list=new ArrayList<Map>(); 483 List<Map> list=new ArrayList<Map>();
471 if(oldlist!=null && oldlist.size()>0){ 484 if(oldlist!=null && oldlist.size()>0) {
472 for (int i = 0; i < oldlist.size(); i++) { 485 for (int i = 0; i < oldlist.size(); i++) {
473 Map map=oldlist.get(i); 486 Map map = oldlist.get(i);
474 String bh= (String)map.get("BH"); 487 if ("207".equals(map.get("DJLX"))) {
475 String zsbh[]=bh.split(","); 488 Map firstmap = AssemblyFirstRegist(map);
476 if(zsbh!=null && zsbh.length>0){ 489 list.add(firstmap);
477 String qlqtzk=(String)map.get("QLQTZK"); 490 continue;
478 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH")); 491 }
479 if(qrlInfoMap!=null){ 492 String bh = (String) map.get("BH");
480 String allQlrmc=(String)qrlInfoMap.get("QLRMC"); 493 String zsbh[] = bh.split(",");
481 String allZjh=(String)qrlInfoMap.get("ZJH"); 494 if (zsbh != null && zsbh.length > 0) {
482 if(StringUtils.isNotBlank(allQlrmc)){ 495 String qlqtzk = (String) map.get("QLQTZK");
496 Map qrlInfoMap = regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH"));
497 if (qrlInfoMap != null) {
498 String allQlrmc = (String) qrlInfoMap.get("QLRMC");
499 String allZjh = (String) qrlInfoMap.get("ZJH");
500 if (StringUtils.isNotBlank(allQlrmc)) {
483 for (int k = 0; k < zsbh.length; k++) { 501 for (int k = 0; k < zsbh.length; k++) {
484 String qlr[]=allQlrmc.split(","); 502 String qlr[] = allQlrmc.split(",");
485 String zjh[]=allZjh.split(","); 503 String zjh[] = allZjh.split(",");
486 Map hashMap=new HashMap(map); 504 Map hashMap = new HashMap(map);
487 hashMap.put("QLRMC",qlr[k]); 505 hashMap.put("QLRMC", qlr[k]);
488 hashMap.put("BH",zsbh[k]); 506 hashMap.put("BH", zsbh[k]);
489 hashMap.put("ZJH",zjh[k]); 507 hashMap.put("ZJH", zjh[k]);
490 List list1= Arrays.asList(qlr); 508 List list1 = Arrays.asList(qlr);
491 List arrList = new ArrayList(list1); 509 List arrList = new ArrayList(list1);
492 arrList.remove(qlr[k]); 510 arrList.remove(qlr[k]);
493 String gyr=StringUtils.join(arrList.toArray(),","); 511 String gyr = StringUtils.join(arrList.toArray(), ",");
494 if(StringUtils.isNotBlank(qlqtzk)){ 512 if (StringUtils.isNotBlank(qlqtzk)) {
495 qlqtzk=qlqtzk.substring(0, qlqtzk.length() - 1); 513 String[] qlzkInfo = qlqtzk.split(";");
496 if(arrList!=null && arrList.size()>0){ 514 for (int j = 0; j < qlzkInfo.length; j++) {
497 hashMap.put("QLQTZK",qlqtzk+hashMap.get("GYQK")+";共有人："+gyr); 515 if (qlzkInfo[j].contains("共有情况")) {
498 }else{ 516 qlzkInfo[j] = "共有情况: " + hashMap.get("GYQK");
499 hashMap.put("QLQTZK",qlqtzk+hashMap.get("GYQK")); 517 }
518 }
519 qlqtzk=StringUtils.join(qlzkInfo, ";");
520 if (arrList != null && arrList.size() > 0) {
521 hashMap.put("QLQTZK", qlqtzk + ";共有人：" + gyr);
522 } else {
523 hashMap.put("QLQTZK", qlqtzk);
500 } 524 }
501
502 } 525 }
503 list.add(hashMap); 526 list.add(hashMap);
504 } 527 }
...@@ -518,6 +541,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -518,6 +541,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
518 List<Map> list=new ArrayList<Map>(); 541 List<Map> list=new ArrayList<Map>();
519 Map map=regBusBdcqzsdjxxMapper.getBdcqzsJbxxById(zsbs); 542 Map map=regBusBdcqzsdjxxMapper.getBdcqzsJbxxById(zsbs);
520 if(map!=null){ 543 if(map!=null){
544 if("207".equals(map.get("DJLX"))){
545 Map firstmap=AssemblyFirstRegist(map);
546 list.add(firstmap);
547 return list;
548 }
521 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH")); 549 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH"));
522 String allQlrmc=(String)qrlInfoMap.get("QLRMC"); 550 String allQlrmc=(String)qrlInfoMap.get("QLRMC");
523 if(StringUtils.isNotBlank(allQlrmc)){ 551 if(StringUtils.isNotBlank(allQlrmc)){
...@@ -537,8 +565,18 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -537,8 +565,18 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
537 arrList.remove(qlr[k]); 565 arrList.remove(qlr[k]);
538 String gyr=StringUtils.join(arrList.toArray(),","); 566 String gyr=StringUtils.join(arrList.toArray(),",");
539 if(StringUtils.isNotBlank(qlqtzk)){ 567 if(StringUtils.isNotBlank(qlqtzk)){
540 qlqtzk=qlqtzk.substring(0, qlqtzk.length() - 1); 568 String[] qlzkInfo = qlqtzk.split(";");
541 hashMap.put("QLQTZK",qlqtzk+hashMap.get("GYQK")+";共有人："+gyr); 569 for (int j = 0; j < qlzkInfo.length; j++) {
570 if (qlzkInfo[j].contains("共有情况")) {
571 qlzkInfo[j] = "共有情况: " + hashMap.get("GYQK");
572 }
573 }
574 qlqtzk=StringUtils.join(qlzkInfo, ";");
575 if (arrList != null && arrList.size() > 0) {
576 hashMap.put("QLQTZK", qlqtzk + ";共有人：" + gyr);
577 } else {
578 hashMap.put("QLQTZK", qlqtzk);
579 }
542 } 580 }
543 list.add(hashMap); 581 list.add(hashMap);
544 } 582 }
...@@ -588,5 +626,50 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -588,5 +626,50 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
588 return ""; 626 return "";
589 } 627 }
590 628
629 /**
630 * 组装首次登记业务
631 */
632 public Map AssemblyFirstRegist(Map map){
633 List<Map> list=regBusBdcqzsdjxxMapper.getBdcqzsjbxxInfoByYwh((String) map.get("YWH"));
634 //获取所有的面积集合
635 Double mjs = 0.0;
636 if(list!=null && list.size()>0){
637 for(int i = 0; i<list.size(); i++){
638 if(list.get(i).get("MJ") != null){
639 mjs += Double.parseDouble((String) list.get(i).get("MJ"));
640 }
641 }
642 BigDecimal bmj = new BigDecimal(mjs);
643 mjs = bmj.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
644 }
645 Map zdjbxxMap=regBusBdcqzsdjxxMapper.getZdjbxxByZddm(((String) map.get("BDCDYH")).substring(0, 19));
646 String zdmj ="0";
647 if(zdjbxxMap!=null){
648 zdmj = zdjbxxMap.get("ZDMJ").toString();
649 }
650 Map zrzmap=regBusBdcqzsdjxxMapper.getZrzInfo(((String) map.get("BDCDYH")).substring(0, 24)+"0000");
651 if(zrzmap!=null){
652 if("2".equals(zrzmap.get("ZDFTFS"))){
653 map.put("MJ", "独用宗地面积"+zdmj+"㎡/房屋建筑面积"+mjs+"㎡");
654 }else {
655 map.put("MJ", "共用宗地面积"+zdmj+"㎡/房屋建筑面积"+mjs+"㎡");
656 }
657 }
658 String qtzk = (String) map.get("QLQTZK");
659 if(qtzk != null){
660 String[] str = qtzk.split(";");
661 qtzk= str[1]+";"+str[4]+"层"+";"+str[6].substring(0, 15)+";";
662 map.put("QLQTZK",qtzk);
663 }
664 String zl = zdjbxxMap.get("ZL")+(String)zrzmap.get("XMMC")+zrzmap.get("GZWMC");
665 map.put("ZL", zl);
666 map.put("BDCDYH",zrzmap.get("BDCDYH"));
667 map.put("ZTS", "本次登记包含"+list.size()+"(套、间)");
668 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH"));
669 if(qrlInfoMap!=null){
670 map.put("ZJH",qrlInfoMap.get("ZJH"));
671 }
672 return map;
673 }
591 674
592 } 675 }
......
...@@ -59,6 +59,8 @@ public interface RegBusBdcqzsdjxxMapper extends BaseMapper<RegBusBdcqzsdjxxDo> { ...@@ -59,6 +59,8 @@ public interface RegBusBdcqzsdjxxMapper extends BaseMapper<RegBusBdcqzsdjxxDo> {
59 59
60 public void updateBdcqzsjbxxInfo(String id); 60 public void updateBdcqzsjbxxInfo(String id);
61 61
62 public void updateBdcqzsjbxxInfoByYwh(String ywh);
63
62 public Map getQlrInfoByYwh(String ywh); 64 public Map getQlrInfoByYwh(String ywh);
63 65
64 public String getQlrInfoByYwhAndqlr(@Param("ywh") String ywh, @Param("qlrmc") String qlrmc); 66 public String getQlrInfoByYwhAndqlr(@Param("ywh") String ywh, @Param("qlrmc") String qlrmc);
......
...@@ -20,6 +20,7 @@ spring: ...@@ -20,6 +20,7 @@ spring:
20 primary: master 20 primary: master
21 datasource: 21 datasource:
22 master: 22 master:
23 #url: jdbc:oracle:thin:@172.16.56.4:1521:ODM
23 url: jdbc:oracle:thin:@172.16.56.21:1521:orcl 24 url: jdbc:oracle:thin:@172.16.56.21:1521:orcl
24 driver-class-name: oracle.jdbc.driver.OracleDriver 25 driver-class-name: oracle.jdbc.driver.OracleDriver
25 username: regs 26 username: regs
...@@ -54,11 +55,12 @@ mybatis-plus: ...@@ -54,11 +55,12 @@ mybatis-plus:
54 call-setters-on-nulls: true 55 call-setters-on-nulls: true
55 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 56 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
56 app: 57 app:
57 hostUrl: http://172.16.56.41:9182 58 hostUrl: http://172.16.56.60:9182
58 bdcdjzmlc: 2890537670326468622 59 bdcdjzmlc: 2905681381004489569
59 bdcqzslc: 2890537800123400234 60 bdcqzslc: 2905684509636506505
60 AppToken: OAduCx5qJD 61 AppToken: lv2M681jcM
61 AppSecret: DifsZNwDnamuRh9jS0gSOTJFvmmKtT 62 AppSecret: mZWAKA2p7vvnTZMNuUKRHaCL3LTgHA
63 areacode: 610702
62 64
63 65
64 management: 66 management:
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 <select id="getElecLicenseInfo" resultType="com.pashanhoo.qys.entity.ElecLicenseInfoDo"> 38 <select id="getElecLicenseInfo" resultType="com.pashanhoo.qys.entity.ElecLicenseInfoDo">
39 select * 39 select *
40 from ELEC_LICENSE_INFO 40 from ELEC_LICENSE_INFO
41 where ywh = #{ywh} and zsbs=#{zsbs} and zsbh=#{zsbh} and zjh=#{zjh} 41 where ywh = #{ywh} and zsbs=#{zsbs} and zsbh=#{zsbh} and zjh=#{zjh}
42 </select> 42 </select>
43 43
44 44
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
4 <update id="updateBdcqzsjbxxInfo"> 4 <update id="updateBdcqzsjbxxInfo">
5 update reg_bus_bdcqzsdjxx set ISCJDZZZ='1' where ID=#{id} 5 update reg_bus_bdcqzsdjxx set ISCJDZZZ='1' where ID=#{id}
6 </update> 6 </update>
7 <update id="updateBdcqzsjbxxInfoByYwh">
8 update reg_bus_bdcqzsdjxx set ISCJDZZZ='1' where ywh=#{ywh}
9 </update>
7 10
8 <select id="getZsdjInfoList" resultType="com.pashanhoo.zhj.entity.RegBusBdcqzsdjxxDo" parameterType="com.pashanhoo.zhj.entity.SynZhjInfoDo"> 11 <select id="getZsdjInfoList" resultType="com.pashanhoo.zhj.entity.RegBusBdcqzsdjxxDo" parameterType="com.pashanhoo.zhj.entity.SynZhjInfoDo">
9 select * from reg_bus_bdcqzsdjxx where 12 select * from reg_bus_bdcqzsdjxx where
...@@ -94,66 +97,67 @@ ...@@ -94,66 +97,67 @@
94 from dual 97 from dual
95 </select> 98 </select>
96 <select id="getBdcqzsjbxxInfo" resultType="java.util.Map"> 99 <select id="getBdcqzsjbxxInfo" resultType="java.util.Map">
97 select c.id, 100 select * from (
98 c.ywh, 101 select c.id,
99 c.bdcdyh, 102 c.ywh,
100 c.bdcqzh, 103 c.bdcdyh,
101 c.create_date, 104 c.bdcqzh,
102 c.qlrmc, 105 c.create_date,
103 c.gyqk, 106 c.qlrmc,
104 c.zl, 107 c.gyqk,
105 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx, 108 c.zl,
106 c.djlx, 109 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx,
107 c.qlxz, 110 c.djlx,
108 c.qt, 111 c.qlxz,
109 c.yt, 112 c.qt,
110 c.mj, 113 c.yt,
111 c.syqx, 114 c.mj,
112 c.qlqtzk, 115 c.syqx,
113 c.fj, 116 c.qlqtzk,
114 c.rights, 117 c.fj,
115 REPLACE(c.dbsj,'-','') as djsj, 118 c.rights,
116 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y, 119 REPLACE(c.dbsj,'-','') as djsj,
117 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m, 120 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y,
118 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d, 121 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m,
119 c.bdcqzbh as bh 122 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d,
120 from reg_bus_bdcqzsdjxx c 123 c.bdcqzbh as bh,row_number() over (partition by ywh,bdcqzbh order by ywh desc) rn
121 where c.del_flag = '0' 124 from reg_bus_bdcqzsdjxx c
122 and c.isxydzzz = '1' 125 where c.del_flag = '0'
123 and c.iscjdzzz = '0' 126 and c.isxydzzz = '1'
124 and dbsj is not null 127 and c.iscjdzzz = '0'
128 and dbsj is not null ) where rn=1
125 </select> 129 </select>
126 130
127 <select id="getBdcqzsjbxxInfoByYwh" resultType="java.util.Map"> 131 <select id="getBdcqzsjbxxInfoByYwh" resultType="java.util.Map">
128 select c.id, 132 select c.id,
129 c.ywh, 133 c.ywh,
130 c.bdcdyh, 134 c.bdcdyh,
131 c.bdcqzh, 135 c.bdcqzh,
132 c.create_date, 136 c.create_date,
133 c.qlrmc, 137 c.qlrmc,
134 c.gyqk, 138 c.gyqk,
135 c.zl, 139 c.zl,
136 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx, 140 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx,
137 c.djlx, 141 c.djlx,
138 c.qlxz, 142 c.qlxz,
139 c.qt, 143 c.qt,
140 c.yt, 144 c.yt,
141 c.mj, 145 c.mj,
142 c.syqx, 146 c.syqx,
143 c.qlqtzk, 147 c.qlqtzk,
144 c.fj, 148 c.fj,
145 c.rights, 149 c.rights,
146 REPLACE(c.dbsj,'-','') as djsj, 150 REPLACE(c.dbsj,'-','') as djsj,
147 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y, 151 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y,
148 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m, 152 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m,
149 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d, 153 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d,
150 c.bdcqzbh as bh 154 c.bdcqzbh as bh
151 from reg_bus_bdcqzsdjxx c 155 from reg_bus_bdcqzsdjxx c
152 where c.del_flag = '0' 156 where c.del_flag = '0'
153 and c.isxydzzz = '1' 157 and c.isxydzzz = '1'
154 and c.iscjdzzz = '0' 158 and c.iscjdzzz = '0'
155 and c.ywh=#{ywh} 159 and c.ywh =#{ywh}
156 and dbsj is not null 160 and c.dbsj is not null
157 </select> 161 </select>
158 <select id="getQlrInfoByYwh" resultType="java.util.Map"> 162 <select id="getQlrInfoByYwh" resultType="java.util.Map">
159 select wm_concat(qlrmc) as qlrmc,wm_concat(zjh) as zjh from reg_bus_qlr c where ywh =#{ywh} and del_flag='0' and qszt='1' order by sxh 163 select wm_concat(qlrmc) as qlrmc,wm_concat(zjh) as zjh from reg_bus_qlr c where ywh =#{ywh} and del_flag='0' and qszt='1' order by sxh
......