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

src/main/java/com/founder/controller/XxcxController.java

 package com.founder.controller;
 
 import com.founder.common.IpADdress;
-import com.founder.model.Result;
-import com.founder.model.TbStAsjView;
+import com.founder.model.*;
 import com.founder.service.XxcxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,6 +24,7 @@ public class XxcxController {
 
     @Autowired
     private XxcxService xxcxService;
+
     @ResponseBody
     @RequestMapping("/ajxxcx")
     public Result queryAsjxx(@RequestBody TbStAsjView tbStAsjView ){
@@ -40,8 +40,19 @@ public class XxcxController {
         }
         TbStAsjView tbStAsjView1=new TbStAsjView();
         try {
-
-            tbStAsjView1 = xxcxService.queryTbStAsjByAsjbh(tbStAsjView.getAsjbh());
+            String asjbh = tbStAsjView.getAsjbh();
+            String jqbh = tbStAsjView.getJqbh();
+            if(StringUtils.isEmpty(asjbh) && StringUtils.isEmpty(jqbh)){
+                reslt.setData(null);
+                reslt.setMsg("查询参数为空，不能查询！");
+                reslt.setStatus("fail");
+                return reslt;
+            }
+            if(!StringUtils.isEmpty(asjbh)){
+                tbStAsjView1 = xxcxService.queryTbStAsjByAsjbh(asjbh);
+            }else if(!StringUtils.isEmpty(jqbh)){
+                tbStAsjView1 = xxcxService.queryTbStAsjByJqbh(jqbh);
+            }
             reslt.setData(tbStAsjView1  );
             reslt.setMsg("案件信息查询成功");
             reslt.setStatus("success");
@@ -54,4 +65,136 @@ public class XxcxController {
         return reslt;
     }
 
+    @RequestMapping("/bhrxxcx")
+    public Result queryBhrxx(@RequestBody TbXwRybhView param){
+        Result reslt = new Result();
+        HttpServletRequest request = IpADdress.getRequest();
+        String header = request.getHeader("founder.authorization");
+        if(StringUtils.isEmpty(header) || !author.equals(header)){
+            reslt.setData(new ArrayList<>());
+            reslt.setMsg("没有授权码或者授权码验证未通过，不能查询！");
+            reslt.setStatus("fail");
+            return reslt;
+        }
+
+        List<TbXwRybhView> tbXwRybhViews = new ArrayList<>();
+        try {
+            if(StringUtils.isEmpty(param.getAsjbh()) && StringUtils.isEmpty(param.getBhrCyzjZjhm())){
+                reslt.setData(new ArrayList<>());
+                reslt.setMsg("查询参数为空，不能查询！");
+                reslt.setStatus("fail");
+                return reslt;
+            }
+            tbXwRybhViews = xxcxService.queryTbXwRybh(param);
+            reslt.setData(tbXwRybhViews);
+            reslt.setMsg("被害人信息查询成功");
+            reslt.setStatus("success");
+        } catch (Exception e) {
+            reslt.setData(tbXwRybhViews);
+            reslt.setMsg("被害人信息查询失败\n"+e.getMessage());
+            reslt.setStatus("error");
+            e.printStackTrace();
+        }
+        return reslt;
+    }
+
+    @RequestMapping("/barxxcx")
+    public Result queryBarxx(@RequestBody TbXwBaView param){
+        Result reslt = new Result();
+        HttpServletRequest request = IpADdress.getRequest();
+        String header = request.getHeader("founder.authorization");
+        if(StringUtils.isEmpty(header) || !author.equals(header)){
+            reslt.setData(new ArrayList<>());
+            reslt.setMsg("没有授权码或者授权码验证未通过，不能查询！");
+            reslt.setStatus("fail");
+            return reslt;
+        }
+
+        List<TbXwBaView> tbXwBaViews = new ArrayList<>();
+        try {
+            if(StringUtils.isEmpty(param.getAsjbh()) && StringUtils.isEmpty(param.getBarCyzjCyzjhm())){
+                reslt.setData(new ArrayList<>());
+                reslt.setMsg("查询参数为空，不能查询！");
+                reslt.setStatus("fail");
+                return reslt;
+            }
+            tbXwBaViews = xxcxService.queryTbXwBa(param);
+            reslt.setData(tbXwBaViews);
+            reslt.setMsg("报案人信息查询成功");
+            reslt.setStatus("success");
+        } catch (Exception e) {
+            reslt.setData(tbXwBaViews);
+            reslt.setMsg("报案人信息查询失败\n"+e.getMessage());
+            reslt.setStatus("error");
+            e.printStackTrace();
+        }
+        return reslt;
+    }
+
+    @RequestMapping("/jjxxcx")
+    public Result queryJjxx(@RequestBody TbZhzxJjxxView param){
+        Result reslt = new Result();
+        HttpServletRequest request = IpADdress.getRequest();
+        String header = request.getHeader("founder.authorization");
+        if(StringUtils.isEmpty(header) || !author.equals(header)){
+            reslt.setData(new ArrayList<>());
+            reslt.setMsg("没有授权码或者授权码验证未通过，不能查询！");
+            reslt.setStatus("fail");
+            return reslt;
+        }
+
+        List<TbZhzxJjxxView> tbZhzxJjxxViews = new ArrayList<>();
+        try {
+            if(StringUtils.isEmpty(param.getJjdbh()) && StringUtils.isEmpty(param.getBjrxm())&& StringUtils.isEmpty(param.getJjyxm())){
+                reslt.setData(new ArrayList<>());
+                reslt.setMsg("查询参数为空，不能查询！");
+                reslt.setStatus("fail");
+                return reslt;
+            }
+            tbZhzxJjxxViews = xxcxService.queryJjxx(param);
+            reslt.setData(tbZhzxJjxxViews);
+            reslt.setMsg("接警信息查询成功");
+            reslt.setStatus("success");
+        } catch (Exception e) {
+            reslt.setData(tbZhzxJjxxViews);
+            reslt.setMsg("接警信息查询失败\n"+e.getMessage());
+            reslt.setStatus("error");
+            e.printStackTrace();
+        }
+        return reslt;
+    }
+
+    @RequestMapping("/cjxxcx")
+    public Result queryCjxx(@RequestBody TbZhzxCjxxView param){
+        Result reslt = new Result();
+        HttpServletRequest request = IpADdress.getRequest();
+        String header = request.getHeader("founder.authorization");
+        if(StringUtils.isEmpty(header) || !author.equals(header)){
+            reslt.setData(new ArrayList<>());
+            reslt.setMsg("没有授权码或者授权码验证未通过，不能查询！");
+            reslt.setStatus("fail");
+            return reslt;
+        }
+
+        List<TbZhzxCjxxView> tbZhzxCjxxViews = new ArrayList<>();
+        try {
+            if(StringUtils.isEmpty(param.getJjdbh()) && StringUtils.isEmpty(param.getPjdbh())&& StringUtils.isEmpty(param.getPjyxm())){
+                reslt.setData(new ArrayList<>());
+                reslt.setMsg("查询参数为空，不能查询！");
+                reslt.setStatus("fail");
+                return reslt;
+            }
+            tbZhzxCjxxViews = xxcxService.queryCjxx(param);
+            reslt.setData(tbZhzxCjxxViews);
+            reslt.setMsg("处警信息查询成功");
+            reslt.setStatus("success");
+        } catch (Exception e) {
+            reslt.setData(tbZhzxCjxxViews);
+            reslt.setMsg("处警信息查询失败\n"+e.getMessage());
+            reslt.setStatus("error");
+            e.printStackTrace();
+        }
+        return reslt;
+    }
+
 }

src/main/java/com/founder/dao/XxcxDao.java

 package com.founder.dao;
 
-import com.founder.model.TbStAsj;
+import com.founder.model.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 @Mapper
 public interface XxcxDao {
 
-    public TbStAsj queryTbStAsjByAsjbh(String asjbh);
+    public TbStAsj queryTbStAsj(TbStAsj param);
+
+    List<TbXwRybh> queryTbXwRybh(TbXwRybhView param);
+
+    List<TbXwBa> queryTbXwBa(TbXwBaView param);
+
+    List<TbZhzxJjxx> queryJjxx(TbZhzxJjxxView param);
+
+    List<TbZhzxCjxx> queryCjxx(TbZhzxCjxxView param);
 }

src/main/java/com/founder/ratelimit/guava/handler/GlobalExceptionHandler.java

 package com.founder.ratelimit.guava.handler;
 
 import cn.hutool.core.lang.Dict;
+import com.founder.common.IpADdress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,11 +21,15 @@ import java.util.Map;
  */
 @RestControllerAdvice
 public class GlobalExceptionHandler {
+    Logger logger = LoggerFactory.getLogger(this.getClass());
     Map<String, Object> res = new HashMap<>();
     @ExceptionHandler(RuntimeException.class)
     public Map handler(RuntimeException ex) {
+        HttpServletRequest request = IpADdress.getRequest();
+        String url = request.getRequestURL().toString();
         res.put("status_code", "10304");
         res.put("message", "数据量超限");
+        logger.error("请求["+url+"]访问异常！原因如下：\n"+ex.getMessage());
         return res;
     }
 }

src/main/java/com/founder/service/XxcxService.java

 package com.founder.service;
 
-import com.founder.model.TbStAsjView;
+import com.founder.model.*;
 
 import java.util.List;
 
@@ -8,4 +8,14 @@ public interface XxcxService {
 
     public List<TbStAsjView> queryTbStAsj(String asjbh,String sfzh);
     public TbStAsjView queryTbStAsjByAsjbh(String asjbh);
+
+    TbStAsjView queryTbStAsjByJqbh(String jqbh);
+
+    List<TbXwRybhView> queryTbXwRybh(TbXwRybhView param);
+
+    List<TbXwBaView> queryTbXwBa(TbXwBaView param);
+
+    List<TbZhzxJjxxView> queryJjxx(TbZhzxJjxxView param);
+
+    List<TbZhzxCjxxView> queryCjxx(TbZhzxCjxxView param);
 }

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

 package com.founder.service.impl;
 
 import com.founder.dao.XxcxDao;
-import com.founder.model.TbStAsj;
-import com.founder.model.TbStAsjView;
+import com.founder.model.*;
 import com.founder.service.XxcxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,7 +29,9 @@ public class XxcxServiceImpl implements XxcxService {
     @Override
     public TbStAsjView queryTbStAsjByAsjbh(String asjbh){
         TbStAsjView tbStAsjView = null;
-        TbStAsj tbStAsj = xxcxDao.queryTbStAsjByAsjbh(asjbh);
+        TbStAsj param = new TbStAsj();
+        param.setAsjbh(asjbh);
+        TbStAsj tbStAsj = xxcxDao.queryTbStAsj(param);
         if(tbStAsj!=null){
             tbStAsjView = new TbStAsjView();
             tbStAsjView.setAjlbdm(tbStAsj.getAjlbdm());
@@ -54,4 +55,147 @@ public class XxcxServiceImpl implements XxcxService {
         }
         return tbStAsjView;
     }
+
+    @Override
+    public TbStAsjView queryTbStAsjByJqbh(String jqbh) {
+        TbStAsjView tbStAsjView = null;
+        TbStAsj param = new TbStAsj();
+        param.setJjbh(jqbh);
+        TbStAsj tbStAsj = xxcxDao.queryTbStAsj(param);
+        if(tbStAsj!=null){
+            tbStAsjView = new TbStAsjView();
+            tbStAsjView.setAjlbdm(tbStAsj.getAjlbdm());
+            tbStAsjView.setAjmc(tbStAsj.getAjmc());
+            tbStAsjView.setZcjddm(tbStAsj.getZcjddm());
+            tbStAsjView.setAsjbh(tbStAsj.getAsjbh());
+            tbStAsjView.setAsjfsddDzmc(tbStAsj.getAsjfsddDzmc());
+            tbStAsjView.setAsjfsddXzqhdm(tbStAsj.getAsjfsddXzqhdm());
+            tbStAsjView.setAsjfssjAsjfsjssj(tbStAsj.getAsjfssjAsjfsjssj());
+            tbStAsjView.setAsjfssjAsjfskssj(tbStAsj.getAsjfssjAsjfskssj());
+            tbStAsjView.setGxsj(tbStAsj.getGxsj());
+            tbStAsjView.setJyaq(tbStAsj.getJyaq());
+            tbStAsjView.setLadwGajgjgdm(tbStAsj.getLadwGajgjgdm());
+            tbStAsjView.setLadwGajgmc(tbStAsj.getLadwGajgmc());
+            tbStAsjView.setLarq(tbStAsj.getLarq());
+            tbStAsjView.setSlsj(tbStAsj.getSlsj());
+            tbStAsjView.setXxlyms(tbStAsj.getXxlyms());
+            tbStAsjView.setZczjZxsj(tbStAsj.getZczjZxsj01());
+            tbStAsjView.setAsjlydm(tbStAsj.getAsjlydm());
+            tbStAsjView.setSaje(tbStAsj.getSsjzrmby());
+        }
+        return tbStAsjView;
+    }
+
+    @Override
+    public List<TbXwRybhView> queryTbXwRybh(TbXwRybhView param) {
+        List<TbXwRybhView> result = new ArrayList<>();
+        try {
+            List<TbXwRybh> rybhList = xxcxDao.queryTbXwRybh(param);
+            if(rybhList!=null && !rybhList.isEmpty()){
+                for(TbXwRybh entity : rybhList){
+                    TbXwRybhView view = new TbXwRybhView();
+                    view.setAsjbh(entity.getAsjbh());
+                    view.setBhrCsrqRqgzsx(entity.getBhrCsrqRqgzsx());
+                    view.setBhrCsrqRqgzxx(entity.getBhrCsrqRqgzxx());
+                    view.setBhrCyzjCyzjdm(entity.getBhrCyzjCyzjdm());
+                    view.setBhrCyzjZjhm(entity.getBhrCyzjZjhm());
+                    view.setBhrGzdw(entity.getBhrGzdw());
+                    view.setBhrLxdh(entity.getBhrLxdh());
+                    view.setBhrXbdm(entity.getBhrXbdm());
+                    view.setBhrXm(entity.getBhrXm());
+                    view.setBhrXzzDzmc(entity.getBhrXzzDzmc());
+                    view.setBhrXzzXzqhdm(entity.getBhrXzzXzqhdm());
+                    result.add(view);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    @Override
+    public List<TbXwBaView> queryTbXwBa(TbXwBaView param) {
+        List<TbXwBaView> result = new ArrayList<>();
+        try {
+            List<TbXwBa> tbXwBaList = xxcxDao.queryTbXwBa(param);
+            if(tbXwBaList!=null && !tbXwBaList.isEmpty()){
+                for(TbXwBa entity : tbXwBaList){
+                    TbXwBaView view = new TbXwBaView();
+                    view.setAsjbh(entity.getAsjbh());
+                    view.setBarCsrq(entity.getBarCsrq());
+                    view.setBarCyzjCyzjdm(entity.getBarCyzjCyzjdm());
+                    view.setBarCyzjCyzjhm(entity.getBarCyzjZjhm());
+                    view.setBarGzdw(entity.getBarGzdw());
+                    view.setBarLxdh(entity.getBarLxdh());
+                    view.setBarXbdm(entity.getBarXbdm());
+                    view.setBarXm(entity.getBarXm());
+                    view.setBarXzzDzmc(entity.getBarXzzDzmc());
+                    view.setBarXzzXzqhdm(entity.getBarXzzXzqhdm());
+                    result.add(view);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    @Override
+    public List<TbZhzxJjxxView> queryJjxx(TbZhzxJjxxView param) {
+        List<TbZhzxJjxxView> result = new ArrayList<>();
+        try {
+            List<TbZhzxJjxx> tbZhzxJjxxList = xxcxDao.queryJjxx(param);
+            if(tbZhzxJjxxList!=null && !tbZhzxJjxxList.isEmpty()){
+                for(TbZhzxJjxx entity : tbZhzxJjxxList){
+                    TbZhzxJjxxView view = new TbZhzxJjxxView();
+                    view.setBjdh(entity.getBjdh());
+                    view.setBjfsdm(entity.getBjfsdm());
+                    view.setBjlbdm(entity.getBjlbdm());
+                    view.setBjlxdm(entity.getBjlxdm());
+                    view.setBjnr(entity.getBjnr());
+                    view.setBjrxb(entity.getBjrxb());
+                    view.setBjrxm(entity.getBjrxm());
+                    view.setBjsj(entity.getBjsj());
+                    view.setBjxldm(entity.getBjxldm());
+                    view.setDicBjfsdm(entity.getDicBjfsdm());
+                    view.setDicJjdw(entity.getDicJjdw());
+                    view.setJjdbh(entity.getJjdbh());
+                    view.setJjdw(entity.getJjdw());
+                    view.setJjyxm(entity.getJjyxm());
+                    view.setLxdh(entity.getLxdh());
+                    view.setSfdd(entity.getSfdd());
+                    view.setYhdz(entity.getYhdz());
+                    result.add(view);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    @Override
+    public List<TbZhzxCjxxView> queryCjxx(TbZhzxCjxxView param) {
+        List<TbZhzxCjxxView> result = new ArrayList<>();
+        try {
+            List<TbZhzxCjxx> tbZhzxCjxxList = xxcxDao.queryCjxx(param);
+            if(tbZhzxCjxxList!=null && !tbZhzxCjxxList.isEmpty()){
+                for(TbZhzxCjxx entity : tbZhzxCjxxList){
+                    TbZhzxCjxxView view = new TbZhzxCjxxView();
+                    view.setJjdbh(entity.getJjdbh());
+                    view.setDdsj(entity.getDdsj());
+                    view.setPjdbh(entity.getPjdbh());
+                    view.setPjsj(entity.getPjsj());
+                    view.setPjyj(entity.getPjyj());
+                    view.setPjyxm(entity.getPjyxm());
+                    view.setZbqk(entity.getZbqk());
+                    result.add(view);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
 }