Merge remote-tracking branch 'origin/dev_hunan' into dev_hunan

src/main/java/com/founder/dao/SysGnsyrzOpenApiDao.java → src/main/java/com/founder/checkAuthorization/mysqldao/SysGnsyrzOpenApiDao.java

-package com.founder.dao;
+package com.founder.checkAuthorization.mysqldao;
 
 
 import com.founder.model.SysGnsyrzOpenApi;

src/main/java/com/founder/config/DataSourceTzConfig.java

-package com.founder.config;
-
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-
-import javax.sql.DataSource;
-
-/**
- * Created by summer on 2016/11/25.
- */
-@Configuration
-@MapperScan(basePackages = "com.founder.*.tzdao", sqlSessionTemplateRef  = "tzSqlSessionTemplate")
-public class DataSourceTzConfig {
-
-    @Bean(name = "tzDataSource")
-    @ConfigurationProperties(prefix = "spring.datasource.tz")
-    public DataSource tzDataSource() {
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "tzSqlSessionFactory")
-    public SqlSessionFactory tzSqlSessionFactory(@Qualifier("tzDataSource") DataSource dataSource) throws Exception {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
-        bean.setDataSource(dataSource);
-        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mybatis/tzMapper/*.xml"));
-        return bean.getObject();
-    }
-    @Bean(name = "tzSqlSessionTemplate")
-    public SqlSessionTemplate tzSqlSessionTemplate(@Qualifier("tzSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
-        return new SqlSessionTemplate(sqlSessionFactory);
-    }
-
-}
+// package com.founder.config;
+//
+// import org.apache.ibatis.session.SqlSessionFactory;
+// import org.mybatis.spring.SqlSessionFactoryBean;
+// import org.mybatis.spring.SqlSessionTemplate;
+// import org.mybatis.spring.annotation.MapperScan;
+// import org.springframework.beans.factory.annotation.Qualifier;
+// import org.springframework.boot.context.properties.ConfigurationProperties;
+// import org.springframework.boot.jdbc.DataSourceBuilder;
+// import org.springframework.context.annotation.Bean;
+// import org.springframework.context.annotation.Configuration;
+// import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+//
+// import javax.sql.DataSource;
+//
+// /**
+//  * Created by summer on 2016/11/25.
+//  */
+// @Configuration
+// @MapperScan(basePackages = "com.founder.*.tzdao", sqlSessionTemplateRef  = "tzSqlSessionTemplate")
+// public class DataSourceTzConfig {
+//
+//     @Bean(name = "tzDataSource")
+//     @ConfigurationProperties(prefix = "spring.datasource.tz")
+//     public DataSource tzDataSource() {
+//         return DataSourceBuilder.create().build();
+//     }
+//
+//     @Bean(name = "tzSqlSessionFactory")
+//     public SqlSessionFactory tzSqlSessionFactory(@Qualifier("tzDataSource") DataSource dataSource) throws Exception {
+//         SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+//         bean.setDataSource(dataSource);
+//         bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mybatis/tzMapper/*.xml"));
+//         return bean.getObject();
+//     }
+//     @Bean(name = "tzSqlSessionTemplate")
+//     public SqlSessionTemplate tzSqlSessionTemplate(@Qualifier("tzSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+//         return new SqlSessionTemplate(sqlSessionFactory);
+//     }
+//
+// }

src/main/java/com/founder/ggfw/controller/GgfwXxcxController.java

+package com.founder.ggfw.controller;
+
+import com.founder.checkAuthorization.annotation.CheckAuthorization;
+import com.founder.checkAuthorization.config.AuthorizationInterceptor;
+import com.founder.checkAuthorization.mysqldao.AuthorizationMapper;
+import com.founder.common.IpADressLock;
+import com.founder.common.LogsUtil;
+import com.founder.ggfw.entity.GgfwQueyrParam;
+import com.founder.ggfw.service.GgfwXxcxService;
+import com.founder.model.R;
+import com.founder.service.SysGnsyrzOpenApiService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @author create by lystar
+ * @date 2022/8/26 16:42
+ */
+@RestController
+@RequestMapping("/ggfw")
+@CheckAuthorization
+@Slf4j
+public class GgfwXxcxController {
+    @Autowired
+    private GgfwXxcxService ggfwXxcxService;
+    @Autowired
+    private AuthorizationMapper authorizationMapper;
+    @Autowired
+    private SysGnsyrzOpenApiService sysGnsyrzOpenApiService;
+    @Autowired
+    private IpADressLock ipADressLock;
+
+    @PostMapping("/getDzxkXcajxx")
+    public R getDzxkXcajxx(HttpServletRequest request, @RequestBody GgfwQueyrParam param) {
+        try {
+            if (StringUtils.isEmpty(param.getAsjbh()) && StringUtils.isEmpty(param.getKyid())) {
+                return R.error("案件编号和勘验id同时为空，不能查询");
+            }
+            Map<String, Object> resultMap = ggfwXxcxService.getDzxkXcajxx(param.getAsjbh(), param.getKyid());
+            Map<String, String> map = getFwidAndXtmc(request);
+            sysGnsyrzOpenApiService.insertGNSYRZOPENAPI("01",map.get("FWMC"), LogsUtil.getNotEmptyFiled(param).toString(),
+                    "","","430000000000",map.get("XTMC"),"", ipADressLock.getAddressIp(request),"0", map.get("FWID"));
+            return R.ok().data(resultMap).message(map.get("FWMC") + "查询成功");
+        } catch (Exception e) {
+            log.error("错误日志", e);
+            return R.error("查询失败，请联系管理员");
+        }
+    }
+
+    @PostMapping("/getDzxkXckyxx")
+    public R getDzxkXckyxx(HttpServletRequest request, @RequestBody GgfwQueyrParam param) {
+        try {
+            if (StringUtils.isEmpty(param.getKyid()) && StringUtils.isEmpty(param.getKyh())) {
+                return R.error("勘验id和勘验编号同时为空，不能查询");
+            }
+            Map<String, Object> resultMap = ggfwXxcxService.getDzxkXckyxx(param.getKyh(), param.getKyid());
+            Map<String, String> map = getFwidAndXtmc(request);
+            sysGnsyrzOpenApiService.insertGNSYRZOPENAPI("01",map.get("FWMC"), LogsUtil.getNotEmptyFiled(param).toString(),
+                    "","","430000000000",map.get("XTMC"),"", ipADressLock.getAddressIp(request),"0", map.get("FWID"));
+            return R.ok().data(resultMap).message(map.get("FWMC") + "查询成功");
+        } catch (Exception e) {
+            log.error("错误日志", e);
+            return R.error("查询失败，请联系管理员");
+        }
+    }
+
+    @PostMapping("/getDzxkXcsaryxx")
+    public R getDzxkXcsaryxx(HttpServletRequest request, @RequestBody GgfwQueyrParam param) {
+        try {
+            if (StringUtils.isEmpty(param.getKyid())) {
+                return R.error("勘验id为空，不能查询");
+            }
+            Map<String, Object> resultMap = ggfwXxcxService.getDzxkXcsaryxx(param.getKyid());
+            Map<String, String> map = getFwidAndXtmc(request);
+            sysGnsyrzOpenApiService.insertGNSYRZOPENAPI("01",map.get("FWMC"), LogsUtil.getNotEmptyFiled(param).toString(),
+                    "","","430000000000",map.get("XTMC"),"", ipADressLock.getAddressIp(request),"0", map.get("FWID"));
+            return R.ok().data(resultMap).message(map.get("FWMC") + "查询成功");
+        } catch (Exception e) {
+            log.error("错误日志", e);
+            return R.error("查询失败，请联系管理员");
+        }
+    }
+
+
+    private Map<String, String> getFwidAndXtmc(HttpServletRequest request) {
+        String appId = request.getHeader(AuthorizationInterceptor.appId);
+        String appSecret = request.getHeader(AuthorizationInterceptor.appSecret);
+        return authorizationMapper.getFwidAndXtmc(appId, appSecret);
+    }
+}

src/main/java/com/founder/ggfw/entity/DzxkXcajxx.java

+package com.founder.ggfw.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author create by lystar
+ * @date 2022/8/26 16:55
+ */
+@Data
+public class DzxkXcajxx {
+    private String asjbh;
+    private String kyid;
+    private String ajlb;
+    private String ajmc;
+    private String jyaq;
+    private String faqh;
+    private String fadd;
+    private Date fakssj;
+    private Date fajssj;
+    private String ajzt;
+    private Date slsj;
+    private String sajz;
+    private String sjly;
+}

src/main/java/com/founder/ggfw/entity/DzxkXckyxx.java

+package com.founder.ggfw.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author create by lystar
+ * @date 2022/8/27 10:46
+ */
+@Data
+public class DzxkXckyxx {
+    private String id;
+    private String kyh;
+    private String kylb;
+    private Date   kykssj;
+    private Date   kyjssj;
+    private String kydd;
+    private String xckyqkId;
+    private String xckyqk;
+    private String kydw;
+    private String kydwCn;
+    private String cjcs;
+    private String cjsbmc;
+    private String sjly;
+    private Date   cjsj;
+}

src/main/java/com/founder/ggfw/entity/DzxkXcsaryxx.java

+package com.founder.ggfw.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author create by lystar
+ * @date 2022/8/27 10:46
+ */
+@Data
+public class DzxkXcsaryxx {
+    private String id;
+    private String kyid;
+    // private String ryjb;
+    private String xm;
+    private String xb;
+    private String lxdh;
+    private String xzzxz;
+    private String hjdxz;
+    // private String zjlx;
+    private String zjh;
+    // private String dw;
+    private Date csrq;
+    // private String sf;
+    private String mz;
+    // private String whcd;
+    private Date cjsj;
+}

src/main/java/com/founder/ggfw/entity/GgfwQueyrParam.java

+package com.founder.ggfw.entity;
+
+import lombok.Data;
+
+/**
+ *
+ * @author create by lystar
+ * @date 2022/8/26 17:45
+ */
+@Data
+public class GgfwQueyrParam {
+    private String asjbh;
+    private String kyid;
+    private String kyh;
+}

src/main/java/com/founder/ggfw/service/GgfwXxcxService.java

+package com.founder.ggfw.service;
+
+import com.founder.ggfw.entity.GgfwQueyrParam;
+
+import java.util.Map;
+
+/**
+ *
+ * @author create by lystar
+ * @date 2022/8/26 17:39
+ */
+public interface GgfwXxcxService {
+    Map<String, Object> getDzxkXcajxx(String asjbh, String kyid);
+
+    Map<String, Object> getDzxkXckyxx(String kyh, String kyid);
+
+    Map<String, Object> getDzxkXcsaryxx(String kyid);
+}

src/main/java/com/founder/ggfw/service/impl/GgfwXxcxServiceImpl.java

+package com.founder.ggfw.service.impl;
+
+import com.founder.ggfw.entity.DzxkXcajxx;
+import com.founder.ggfw.entity.DzxkXckyxx;
+import com.founder.ggfw.entity.DzxkXcsaryxx;
+import com.founder.ggfw.service.GgfwXxcxService;
+import com.founder.ggfw.xkxtdao.XkxtGgfwMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author create by lystar
+ * @date 2022/8/26 17:39
+ */
+@Service
+public class GgfwXxcxServiceImpl implements GgfwXxcxService {
+    @Autowired
+    private XkxtGgfwMapper xkxtGgfwMapper;
+
+    @Override
+    public Map<String, Object> getDzxkXcajxx(String asjbh, String kyid) {
+        List<DzxkXcajxx> xcajxx = xkxtGgfwMapper.getXcajxx(asjbh, kyid);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("rows", xcajxx);
+        map.put("total", xcajxx.size());
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getDzxkXckyxx(String kyh, String kyid) {
+        List<DzxkXckyxx> xcajxx = xkxtGgfwMapper.getDzxkXckyxx(kyh, kyid);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("rows", xcajxx);
+        map.put("total", xcajxx.size());
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getDzxkXcsaryxx(String kyid) {
+        List<DzxkXcsaryxx> xcajxx = xkxtGgfwMapper.getDzxkXcsaryxx(kyid);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("rows", xcajxx);
+        map.put("total", xcajxx.size());
+        return map;
+    }
+}

src/main/java/com/founder/ggfw/xkxtdao/XkxtGgfwMapper.java

+package com.founder.ggfw.xkxtdao;
+
+import com.founder.ggfw.entity.DzxkXcajxx;
+import com.founder.ggfw.entity.DzxkXckyxx;
+import com.founder.ggfw.entity.DzxkXcsaryxx;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author create by lystar
+ * @date 2022/8/24 09:14
+ */
+@Mapper
+@Repository
+public interface XkxtGgfwMapper {
+    List<DzxkXcajxx> getXcajxx(@Param("asjbh") String asjbh, @Param("kyid") String kyid);
+
+    List<DzxkXckyxx> getDzxkXckyxx(@Param("kyh") String kyh, @Param("kyid") String kyid);
+
+    List<DzxkXcsaryxx> getDzxkXcsaryxx(@Param("kyid") String kyid);
+}

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

 package com.founder.service.impl;
 
-import com.founder.dao.LogDao;
-import com.founder.dao.SysGnsyrzOpenApiDao;
-import com.founder.model.Rycj;
+import com.founder.checkAuthorization.mysqldao.SysGnsyrzOpenApiDao;
 import com.founder.model.SysGnsyrzOpenApi;
-import com.founder.model.SysLogJccjXxbs;
-import com.founder.service.LogService;
 import com.founder.service.SysGnsyrzOpenApiService;
-import org.apache.ibatis.session.SqlSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -68,7 +63,7 @@ public class SysGnsyrzOpenApiServiceImpl implements SysGnsyrzOpenApiService {
         SysGnsyrzOpenApi gnsyrz = new SysGnsyrzOpenApi();
         gnsyrz.setYhGmsfhm(userId);
         gnsyrz.setYhIp(ip);
-        gnsyrz.setYhIp(fwid);
+        gnsyrz.setFwid(fwid);
         gnsyrz.setYhdwGajgjgdm(unitCode);
         gnsyrz.setYhdwGajgmc(unitName);
         gnsyrz.setRzlsh(rzlsh);

src/main/java/com/founder/zyfw/tzdao/TzZyfwMapper.java → src/main/java/com/founder/zyfw/mysqldao/TzZyfwMapper.java

-package com.founder.zyfw.tzdao;
+package com.founder.zyfw.mysqldao;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/founder/zyfw/service/impl/ZyfwServiceImpl.java

@@ -4,7 +4,7 @@ import com.founder.zyfw.ajzwdao.AjzwZyfwMapper;
 import com.founder.zyfw.mysqldao.XzZyfwMapper;
 import com.founder.zyfw.service.ZyfwService;
 import com.founder.zyfw.shcedao.ShceZyfwMapper;
-import com.founder.zyfw.tzdao.TzZyfwMapper;
+import com.founder.zyfw.mysqldao.TzZyfwMapper;
 import com.founder.zyfw.xkxtdao.XkxtZyfwMapper;
 import com.founder.zyfw.ythcjdao.YthcjZyfwMapper;
 import com.founder.zyfw.zwbzdao.ZwbzZyfwMapper;

src/main/resources/application-dev.yml

@@ -67,12 +67,12 @@ spring:
       password: founder2022
       jdbc-url: jdbc:oracle:thin:@47.92.129.99:1560:orcl
       type: com.alibaba.druid.pool.DruidDataSource
-    tz:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      username: hnstxz
-      password: hnstxzasdf!234
-      jdbc-url: jdbc:mysql://65.26.2.141:3306/hn_eis?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-      type: com.alibaba.druid.pool.DruidDataSource
+#    tz:
+#      driver-class-name: com.mysql.cj.jdbc.Driver
+#      username: hnstxz
+#      password: hnstxzasdf!234
+#      jdbc-url: jdbc:mysql://65.26.2.141:3306/hn_eis?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+#      type: com.alibaba.druid.pool.DruidDataSource
     xkxt:
       driver-class-name: com.mysql.cj.jdbc.Driver
       username: xiankan3_zjk

src/main/resources/mybatis/mapper/SysGnsyrzOpenApiMapper.xml → src/main/resources/mybatis/mysqlMapper/SysGnsyrzOpenApiMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.founder.dao.SysGnsyrzOpenApiDao">
+<mapper namespace="com.founder.checkAuthorization.mysqldao.SysGnsyrzOpenApiDao">
 
 
     <insert id="saveSysgnsyrz" parameterType="com.founder.model.SysGnsyrzOpenApi">

src/main/resources/mybatis/tzMapper/TzZyfwMapper.xml → src/main/resources/mybatis/mysqlMapper/TzZyfwMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.founder.zyfw.tzdao.TzZyfwMapper">
+<mapper namespace="com.founder.zyfw.mysqldao.TzZyfwMapper">
     <select id="getXcspCount" resultType="java.lang.Integer">
-        select count(*) from view_app_camera_media
+        select count(*) from st_app_camera_media
         <if test="isZl == '1'.toString()">
             where create_time >= DATE_FORMAT(NOW(),'%Y-%m-%d 00:00:00')
         </if>
     </select>
     <select id="getXctpCount" resultType="java.lang.Integer">
-        select count(*) from view_app_lawcase_objext_result
+        select count(*) from st_app_lawcase_objext_result
         <if test="isZl == '1'.toString()">
             where createtime >= DATE_FORMAT(NOW(),'%Y-%m-%d 00:00:00')
         </if>

src/main/resources/mybatis/xkxtMapper/XkxtGgfwMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.founder.ggfw.xkxtdao.XkxtGgfwMapper">
+    <select id="getXcajxx" resultType="com.founder.ggfw.entity.DzxkXcajxx">
+        select * from v_scene_investigation_dispatch where scbz = 0
+        <if test="asjbh != null and asjbh != ''">
+            and ajbh = #{asjbh}
+        </if>
+        <if test="kyid != null and kyid != ''">
+            and ajbh = #{asjbh}
+        </if>
+    </select>
+    <select id="getDzxkXckyxx" resultType="com.founder.ggfw.entity.DzxkXckyxx">
+        select id,
+               kyh,
+               kylb,
+               kykssj,
+               kyjssj,
+               kydd,
+               xckyqk_id as xckyqkId,
+               xckyqk,
+               kydw,
+               kydw_cn as kydwCn,
+               cjcs,
+               cjsbmc,
+               sjly,
+               cjsj
+        from v_scene_investigation
+        where scbz = 0
+        <if test="kyh != null and kyh != ''">
+            and kyh = #{kyh}
+        </if>
+        <if test="kyid != null and kyid != ''">
+            and kyid = #{kyid}
+        </if>
+    </select>
+    <select id="getDzxkXcsaryxx" resultType="com.founder.ggfw.entity.DzxkXcsaryxx">
+        select *
+        from v_scene_offender
+        where scbz = 0
+          and kyid = #{kyid}
+    </select>
+</mapper>
\ No newline at end of file