Merge remote-tracking branch 'remotes/origin/master'

src/main/java/com/founder/model/TbStAsjView.java

@@ -35,8 +35,8 @@ public class TbStAsjView implements Serializable {
     //案事件发生时间_案事件发生结束时间
     private java.util.Date asjfssjAsjfsjssj;
 
-    //涉案金额
-    private Double saje;
+    //损失价值
+    private Double ssjzrmby;
 
     //案事件发生地点_行政区划代码
     private String asjfsddXzqhdm;
@@ -158,12 +158,12 @@ public class TbStAsjView implements Serializable {
         this.asjfssjAsjfsjssj = asjfssjAsjfsjssj;
     }
 
-    public Double getSaje() {
-        return saje;
+    public Double getSsjzrmby() {
+        return ssjzrmby;
     }
 
-    public void setSaje(Double saje) {
-        this.saje = saje;
+    public void setSsjzrmby(Double ssjzrmby) {
+        this.ssjzrmby = ssjzrmby;
     }
 
     public String getAsjfsddXzqhdm() {

src/main/java/com/founder/service/impl/XxcxServiceImpl.java

@@ -51,7 +51,8 @@ public class XxcxServiceImpl implements XxcxService {
             tbStAsjView.setXxlyms(tbStAsj.getXxlyms());
             tbStAsjView.setZczjZxsj(tbStAsj.getZczjZxsj01());
             tbStAsjView.setAsjlydm(tbStAsj.getAsjlydm());
-            tbStAsjView.setSaje(tbStAsj.getSsjzrmby());
+            tbStAsjView.setSsjzrmby(tbStAsj.getSsjzrmby());
+            tbStAsjView.setJqbh(tbStAsj.getJjbh());
         }
         return tbStAsjView;
     }
@@ -81,7 +82,8 @@ public class XxcxServiceImpl implements XxcxService {
             tbStAsjView.setXxlyms(tbStAsj.getXxlyms());
             tbStAsjView.setZczjZxsj(tbStAsj.getZczjZxsj01());
             tbStAsjView.setAsjlydm(tbStAsj.getAsjlydm());
-            tbStAsjView.setSaje(tbStAsj.getSsjzrmby());
+            tbStAsjView.setSsjzrmby(tbStAsj.getSsjzrmby());
+            tbStAsjView.setJqbh(tbStAsj.getJjbh());
         }
         return tbStAsjView;
     }

src/main/resources/application.yml

@@ -24,7 +24,7 @@ jslocation: E:/sysDictJs/common/dict/
 ssdw: 140000000000
 
 server:
-  port: 9061
+  port: 8762
 xxcx:
   author: Basic 9b6c45cfcf3a4a629e3ed90fa3e5d058
 orc: http://39.99.224.27:8866/predict/chinese_ocr_db_crnn_mobile

src/main/resources/mybatis/mapper/XxcxDaoMapper.xml

@@ -4,207 +4,23 @@
     <select id="queryTbStAsj" parameterType="com.founder.model.TbStAsj" resultType="com.founder.model.TbStAsj">
         select ASJBH as asjbh,
         JJBH as jjbh,
-        XCKYBH as xckybh,
         ASJLYDM as asjlydm,
-        XSJQLBDM as xsjqlbdm,
         ZCJDDM as zcjddm,
-        XSAJLASCJGDM as xsajlascjgdm,
         AJLBDM as ajlbdm,
-        ZATZ_JYQK as zatzJyqk,
-        TSSDDM as tssddm,
-        ZATZZDFL_JYQK as zatzzdflJyqk,
-        ZATZBCMS_JYQK as zatzbcmsJyqk,
-        ZATZ_AJZATZJHBD as zatzAjzatzjhbd,
         AJMC as ajmc,
-        FXASJSJ as fxasjsj,
-        FXASJDD_XZQHDM as fxasjddXzqhdm,
-        FXASJDD_DZMC as fxasjddDzmc,
+        XXLYMS as xxlyms,
         ASJFSSJ_ASJFSKSSJ as asjfssjAsjfskssj,
         ASJFSSJ_ASJFSJSSJ as asjfssjAsjfsjssj,
-        ASJFSSJ_RSDDM as asjfssjRsddm,
-        ASJFSSJ_ZASJ_ZASJLBDM as asjfssjZasjZasjlbdm,
-        ASJFSSJ_ZASJ_DMBCMS as asjfssjZasjDmbcms,
         ASJFSDD_XZQHDM as asjfsddXzqhdm,
         ASJFSDD_DZMC as asjfsddDzmc,
-        ASJFSDD_DQJD as asjfsddDqjd,
-        ASJFSDD_DQWD as asjfsddDqwd,
-        ASJFSDD_DYLBDM as asjfsddDylbdm,
-        ASJFSDD_SACS_SACSLBDM as asjfsddSacsSacslbdm,
-        ASJFSDD_SACS_DMBCMS as asjfsddSacsDmbcms,
-        ASJFSDD_KJBW_KJBWLBDM as asjfsddKjbwKjbwlbdm,
-        ASJFSDD_KJBW_DMBCMS as asjfsddKjbwDmbcms,
-        ASJFSDD_SFJZWN_PDBZ as asjfsddSfjzwnPdbz,
-        ASJFSDD_JZWCS as asjfsddJzwcs,
-        ASJFSDD_ASJFSLC as asjfsddAsjfslc,
-        ASJFSDD_SFZLZZ_PDBZ as asjfsddSfzlzzPdbz,
-        SFSQ_PDBZ as sfsqPdbz,
-        SFSB_PDBZ as sfsbPdbz,
-        SFMA_PDBZ as sfmaPdbz,
-        SFSH_PDBZ as sfshPdbz,
-        SFSJDQPCL_PDBZ as sfsjdqpclPdbz,
-        SFSW_PDBZ as sfswPdbz,
-        SFGM_PDBZ as sfgmPdbz,
-        SWASJSWQK as swasjswqk,
-        ASJDBJBDM as asjdbjbdm,
-        LLFS_LLFSDM as llfsLlfsdm,
-        LLFS_DMBCMS as llfsDmbcms,
-        LLSJ as llsj,
-        SY_JYQK as syJyqk,
-        FZXYRTSXW_FZXYRTSXWDM as fzxyrtsxwFzxyrtsxwdm,
-        FZXYRTSXW_DMBCMS as fzxyrtsxwDmbcms,
-        FZXYRSXZAHJQK as fzxyrsxzahjqk,
-        QTSDTD_JYQK as qtsdtdJyqk,
-        ASJFSSJFX_ASJFSKSSJ as asjfssjfxAsjfskssj,
-        ASJFSSJFX_ASJFSJSSJ as asjfssjfxAsjfsjssj,
-        ZARFX_RSXX as zarfxRsxx,
-        ZARFX_RSSX as zarfxRssx,
-        FZXYRTZ_JYQK as fzxyrtzJyqk,
-        FZXYRTSZC_FZXYRTSZCDM as fzxyrtszcFzxyrtszcdm,
-        FZXYRTSZC_DMBCMS as fzxyrtszcDmbcms,
-        ZAGJ_SAWPDM as zagjSawpdm,
-        ZAGJ_JYQK as zagjJyqk,
-        ZADJMS as zadjms,
-        ZAMDMS as zamdms,
-        KJFWDM as kjfwdm,
-        LCZA_JYQK as lczaJyqk,
-        JHZA_JYQK as jhzaJyqk,
-        GTFZFZXYRZHXSDM as gtfzfzxyrzhxsdm,
-        GTFZFZXYRGC_GTFZFZXYRGCDM as gtfzfzxyrgcGtfzfzxyrgcdm,
-        GTFZFZXYRGC_DMBCMS as gtfzfzxyrgcDmbcms,
-        XZWPFX_SAWP_SAWPDM as xzwpfxSawpSawpdm,
-        XZWPFX_SAWP_DMBCMS as xzwpfxSawpDmbcms,
-        SSWPQX_JYQK as sswpqxJyqk,
-        FZXYRYLWP_JYQK as fzxyrylwpJyqk,
-        XCKYWP_JYQK as xckywpJyqk,
-        FXXS_JYQK as fxxsJyqk,
-        ASJSWRY_RS as asjswryRs,
-        ASJSSRY_RS as asjssryRs,
-        ASJSSCW_JYQK as asjsscwJyqk,
         SSJZRMBY as ssjzrmby,
-        KYZSQZ_WPSL as kyzsqzWpsl,
-        KYMYQZ_WPSL as kymyqzWpsl,
-        KYZZQZ_WPSL as kyzzqzWpsl,
-        KYFZQZ_WPSL as kyfzqzWpsl,
-        KYQTQZ_WPSL as kyqtqzWpsl,
         SLSJ as slsj,
-        SLDW_GAJGJGDM as sldwGajgjgdm,
-        SLDW_GAJGMC as sldwGajgmc,
         LARQ as larq,
         LADW_GAJGJGDM as ladwGajgjgdm,
         LADW_GAJGMC as ladwGajgmc,
-        ZARY_RS as zaryRs,
-        SJCWJZRMBY as sjcwjzrmby,
-        ZCZJ_ZCXWYJMS as zczjZcxwyjms,
         ZCZJ_ZXSJ01 as zczjZxsj01,
-        ZCZJDW_GAJGJGDM as zczjdwGajgjgdm,
-        ZCZJDW_GAJGMC as zczjdwGajgmc,
-        YSSCQSRQ as ysscqsrq,
-        YSSCQSAJSCFHJDDM as ysscqsajscfhjddm,
-        SFCXAJ_PDBZ as sfcxajPdbz,
-        CXAJYYDM as cxajyydm,
-        CXAJDW_GAJGJGDM as cxajdwGajgjgdm,
-        CXAJDW_GAJGMC as cxajdwGajgmc,
-        CXAJRQ as cxajrq,
-        XSAJXSGZJGDM as xsajxsgzjgdm,
-        XBR_XM as xbrXm,
-        XBR_GMSFHM as xbrGmsfhm,
-        XBR_LXDH as xbrLxdh,
-        XSJSFZR_XM as xsjsfzrXm,
-        XSJSFZR_GMSFHM as xsjsfzrGmsfhm,
-        XSJSFZR_LXDH as xsjsfzrLxdh,
-        GAJGFZR_XM as gajgfzrXm,
-        GAJGFZR_GMSFHM as gajgfzrGmsfhm,
-        GAJGFZR_LXDH as gajgfzrLxdh,
-        XXDJRY_XM as xxdjryXm,
-        XXCZRY_GMSFHM as xxczryGmsfhm,
-        XXDJRY_GMSFHM as xxdjryGmsfhm,
-        XXCZRY_XM as xxczryXm,
-        XXCZDW_GAJGJGDM as xxczdwGajgjgdm,
-        XXCZDW_GAJGMC as xxczdwGajgmc,
-        XXDJRY_LXDH as xxdjryLxdh,
-        XXDJDW_GAJGMC as xxdjdwGajgmc,
-        XXLYMS as xxlyms,
-        XXSC_PDBZ as xxscPdbz,
-        XXDJDW_GAJGJGDM as xxdjdwGajgjgdm,
-        DJSJ as djsj,
-        JJSD_JJSDDM as jjsdJjsddm,
-        XPSD_DMBCMS as xpsdDmbcms,
-        QQSD_QQSDDM as qqsdQqsddm,
-        JSSD_DMBCMS as jssdDmbcms,
-        YBSDDM as ybsddm,
-        SBSD_SBSDDM as sbsdSbsddm,
-        XTKJTPSD_JSSD_JSSDDM as xtkjtpsdJssdJssddm,
-        ZPSD_ZPSDDM as zpsdZpsddm,
-        WLZASD_WLZASDDM as wlzasdWlzasddm,
-        XTKJTPSD_JSSD_DMBCMS as xtkjtpsdJssdDmbcms,
-        LKJZKJFS_DMBCMS as lkjzkjfsDmbcms,
-        JRJZKJFSJSD_DMBCMS as jrjzkjfsjsdDmbcms,
-        XTKJTPSD_XTKJTPSDDM as xtkjtpsdXtkjtpsddm,
-        WLZASD_DMBCMS as wlzasdDmbcms,
-        SBSD_DMBCMS as sbsdDmbcms,
-        GRZCSD_GRZCSDDM as grzcsdGrzcsddm,
-        MCSF_DMBCMS as mcsfDmbcms,
-        XPSYWP_SAWPDM as xpsywpSawpdm,
-        XPSD_XPSDDM as xpsdXpsddm,
-        MYDWMY_MCDWMYDM as mydwmyMcdwmydm,
-        MCSF_MCSFDM as mcsfMcsfdm,
-        MCGXR_DMBCMS as mcgxrDmbcms,
-        JJSD_DMBCMS as jjsdDmbcms,
-        QQSD_DMBCMS as qqsdDmbcms,
-        LKJZKJFS_LKJZKJFSDM as lkjzkjfsLkjzkjfsdm,
-        MCMYSD_MCMYSDDM as mcmysdMcmysddm,
-        ZAZBSD_ZAZBSDDM as zazbsdZazbsddm,
         GXSJ as gxsj,
-        MYDWMY_DMBCMS as mydwmyDmbcms,
-        XCWPFDCD_XCWPFDCDDM as xcwpfdcdXcwpfdcddm,
-        GRZCSD_DMBCMS as grzcsdDmbcms,
-        XCWPFDCD_DMBCMS as xcwpfdcdDmbcms,
-        MCMYSD_DMBCMS as mcmysdDmbcms,
-        JRJZKJFSJSD_JRJZKJFSJSDDM as jrjzkjfsjsdJrjzkjfsjsddm,
-        XTKJTPSD_DMBCMS as xtkjtpsdDmbcms,
-        XPSYWP_DMBCMS as xpsywpDmbcms,
-        ZPSD_DMBCMS as zpsdDmbcms,
-        MCGXR_MCGXRDM as mcgxrMcgxrdm,
-        ZAZBSD_DMBCMS as zazbsdDmbcms,
-        JSSD_JSSDDM as jssdJssddm,
-        ZUZDW_GAJGJGDM as zuzdwGajgjgdm,
-        ZUZDW_GAJGMC as zuzdwGajgmc,
-        ZZDWFZR_XM as zzdwfzrXm,
-        ZZDWFZR_GMSFHM as zzdwfzrGmsfhm,
-        ZZDWFZR_LXDH as zzdwfzrLxdh,
-        ZUZDW_ZBR_XM as zuzdwZbrXm,
-        ZUZDW_ZBR_LXDH as zuzdwZbrLxdh,
-        ZUZDW_ZBR_GMSFHM as zuzdwZbrGmsfhm,
-        ZUZDW_XBR_XM1 as zuzdwXbrXm1,
-        ZUZDW_XBR_GMSFHM1 as zuzdwXbrGmsfhm1,
-        ZUZDW_XBR_LXDH1 as zuzdwXbrLxdh1,
-        ZUZDW_XBR_XM2 as zuzdwXbrXm2,
-        ZUZDW_XBR_GMSFHM2 as zuzdwXbrGmsfhm2,
-        ZUZDW_XBR_LXDH2 as zuzdwXbrLxdh2,
-        ZBR_XM as zbrXm,
-        ZBR_LXDH as zbrLxdh,
-        ZBR_GMSFHM as zbrGmsfhm,
-        JZAJBH as jzajbh,
-        JYAQ as jyaq,
-        GABXF as gabxf,
-        XXRBK_PDBZ as xxrbkPdbz,
-        XXRSK_PDBZ as xxrskPdbz,
-        XXRBKSJ as xxrbksj,
-        XXRSKSJ as xxrsksj,
-        ZADJDM as zadjdm,
-        AJSFXCKY_PDBZ as ajsfxckyPdbz,
-        ASJ_XC_QRR_GMSFHM as asjXcQrrGmsfhm,
-        ASJ_XC_QRR_XM as asjXcQrrXm,
-        ASJ_XC_QRSJ as asjXcQrsj,
-        AJLX_DG as ajlxDg,
-        AB_DG as abDg,
-        TZ_PDBZ_DG as tzPdbzDg,
-        AJSTATE as ajstate,
-        SFLSJA_PDBZ as sflsjaPdbz,
-        SFWWFZ_PDBZ as sfwwfzPdbz,
-        PART as part,
-        AJYWZTDM as ajywztdm,
-        ASJFSDD_GXPCS as asjfsddGxpcs
+        JYAQ as jyaq
         from TB_ST_ASJ
         where 1=1
         and xxsc_pdbz = '0'
@@ -215,79 +31,18 @@
     <select id="queryTbXwRybh" resultType="com.founder.model.TbXwRybh" parameterType="com.founder.model.TbXwRybhView">
         select XXZJBH as xxzjbh,
             ASJBH as asjbh,
-            WZMST_PDBZ as wzmstPdbz,
-            YSBQHSZRY_PDBZ as ysbqhszryPdbz,
-            BHSJ_KSSJ as bhsjKssj,
-            BHSJ_JSSJ as bhsjJssj,
-            BHDD_DZMC as bhddDzmc,
-            RSQFJGDM as rsqfjgdm,
-            RSSHCDDM as rsshcddm,
-            SSHBW_JYQK as sshbwJyqk,
-            SSJZRMBY as ssjzrmby,
-            SFFXST_PDBZ as sffxstPdbz,
-            BHR_ASJXGRYBH as bhrAsjxgrybh,
-            BHR_XXFC_PDBZ as bhrXxfcPdbz,
-            BHR_STBH as bhrStbh,
             BHR_XM as bhrXm,
             BHR_CYZJ_CYZJDM as bhrCyzjCyzjdm,
-            BHR_CYZJ_DMBCMS as bhrCyzjDmbcms,
             BHR_CYZJ_ZJHM as bhrCyzjZjhm,
             BHR_XBDM as bhrXbdm,
             BHR_CSRQ_RQGZXX as bhrCsrqRqgzxx,
             BHR_CSRQ_RQGZSX as bhrCsrqRqgzsx,
-            BHR_GJDM as bhrGjdm,
-            BHR_JGDM as bhrJgdm,
-            BHR_MZDM as bhrMzdm,
-            BHR_HJDZ_XZQHDM as bhrHjdzXzqhdm,
-            BHR_HJDZ_DZMC as bhrHjdzDzmc,
             BHR_XZZ_XZQHDM as bhrXzzXzqhdm,
             BHR_XZZ_DZMC as bhrXzzDzmc,
-            BHR_JWZZ_GJHDQDM as bhrJwzzGjhdqdm,
-            BHR_JWZZ_DZMC as bhrJwzzDzmc,
-            BHR_ZY_ZYLBDM as bhrZyZylbdm,
-            BHR_ZY_DMBCMS as bhrZyDmbcms,
-            BHR_ASJXGRYSF_ASJXGRYSFDM as bhrAsjxgrysfAsjxgrysfdm,
-            BHR_ASJXGRYSF_DMBCMS as bhrAsjxgrysfDmbcms,
-            BHR_SG as bhrSg,
-            BHR_TZ as bhrTz,
-            BHR_ZC as bhrZc,
-            BHR_TMTZMS as bhrTmtzms,
-            BHR_TBBJMS as bhrTbbjms,
-            BHR_RQTTZ_JYQK as bhrRqttzJyqk,
             BHR_GRAHJHDTD_JYQK as bhrGrahjhdtdJyqk,
-            BHR_YZTZMS as bhrYztzms,
             BHR_GZDW as bhrGzdw,
             BHR_LXDH as bhrLxdh,
-            BHR_SFYXDS_PDBZ as bhrSfyxdsPdbz,
-            BHR_RQX_JYQK as bhrRqxJyqk,
-            BHR_XDWP_JYQK as bhrXdwpJyqk,
-            BHR_SZZWBH as bhrSzzwbh,
-            BHR_RYDNABH as bhrRydnabh,
-            BHR_BZ as bhrBz,
-            LXR_XM as lxrXm,
-            LXR_CYZJDM as lxrCyzjdm,
-            LXR_ZJHM as lxrZjhm,
-            XXSC_PDBZ as xxscPdbz,
-            XXDJDW_GAJGJGDM as xxdjdwGajgjgdm,
-            XXDJDW_GAJGMC as xxdjdwGajgmc,
-            XXDJRY_XM as xxdjryXm,
-            XXDJRY_GMSFHM as xxdjryGmsfhm,
-            XXDJRY_LXDH as xxdjryLxdh,
-            DJSJ as djsj,
-            XXCZDW_GAJGJGDM as xxczdwGajgjgdm,
-            XXCZDW_GAJGMC as xxczdwGajgmc,
-            XXCZRY_XM as xxczryXm,
-            XXCZRY_GMSFHM as xxczryGmsfhm,
-            GXSJ as gxsj,
-            XXLYMS as xxlyms,
-            XXRSKSJ as xxrsksj,
-            XXRBKSJ as xxrbksj,
-            XXRSK_PDBZ as xxrskPdbz,
-            XXRBK_PDBZ as xxrbkPdbz,
-            BHR_JZRYBH as bhrJzrybh,
-            SBZT as sbzt,
-            GABXF as gabxf,
-            IF_COLLECT as ifCollect
+            DJSJ as djsj
         from TB_XW_RYBH
         where 1=1
         and XXSC_PDBZ = '0'
@@ -301,48 +56,15 @@
     
     <select id="queryTbXwBa" resultType="com.founder.model.TbXwBa" parameterType="com.founder.model.TbXwBaView">
         select BAR_CYZJ_CYZJDM as barCyzjCyzjdm,
-            XXZJBH as xxzjbh,
             ASJBH as asjbh,
-            BA_JYQK as baJyqk,
-            BASJ as basj,
-            BADD_XZQHDM as baddXzqhdm,
-            BADD_DZMC as baddDzmc,
-            BAR_ASJXGRYBH as barAsjxgrybh,
             BAR_XM as barXm,
-            BAR_CYZJ_CYZJHM as barCyzjCyzjhm,
-            BAR_CYZJ_DMBCMS as barCyzjDmbcms,
             BAR_CYZJ_ZJHM as barCyzjZjhm,
             BAR_CSRQ as barCsrq,
             BAR_XBDM as barXbdm,
-            BAR_GJDM as barGjdm,
-            BAR_JGDM as barJgdm,
-            BAR_MZDM as barMzdm,
             BAR_XZZ_XZQHDM as barXzzXzqhdm,
             BAR_XZZ_DZMC as barXzzDzmc,
             BAR_GZDW as barGzdw,
-            BAR_LXDH as barLxdh,
-            BAR_BZ as barBz,
-            GLXX_XXZJBH as glxxXxzjbh,
-            XXSC_PDBZ as xxscPdbz,
-            XXDJDW_GAJGJGDM as xxdjdwGajgjgdm,
-            XXDJDW_GAJGMC as xxdjdwGajgmc,
-            XXDJRY_XM as xxdjryXm,
-            XXDJRY_GMSFHM as xxdjryGmsfhm,
-            XXDJRY_LXDH as xxdjryLxdh,
-            DJSJ as djsj,
-            XXCZDW_GAJGJGDM as xxczdwGajgjgdm,
-            XXCZDW_GAJGMC as xxczdwGajgmc,
-            XXCZRY_XM as xxczryXm,
-            XXCZRY_GMSFHM as xxczryGmsfhm,
-            GXSJ as gxsj,
-            XXLYMS as xxlyms,
-            XXRSKSJ as xxrsksj,
-            XXRBKSJ as xxrbksj,
-            XXRSK_PDBZ as xxrskPdbz,
-            XXRBK_PDBZ as xxrbkPdbz,
-            BAR_JZRYBH as barJzrybh,
-            GABXF as gabxf,
-            IF_COLLECT as ifCollect
+            BAR_LXDH as barLxdh
         from TB_XW_BA
         where 1=1
         and XXSC_PDBZ = '0'