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

common/common_utils/src/main/java/com/founder/commonutils/publicEntity/RyReceiving.java

+package com.founder.commonutils.publicEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel
+public class RyReceiving {
+
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/CarKkInfo.java

+package com.founder.commonutils.skMapEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 返回到时空大数据的车辆卡口信息
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel
+public class CarKkInfo {
+    private String id;//保存的卡口记录id
+    @ApiModelProperty("卡口地址")
+    private String address;//卡口地址
+    @ApiModelProperty("卡口编号")
+    private String Enumber;//卡口编号
+    @ApiModelProperty("经度")
+    private String x;//经度
+    @ApiModelProperty("纬度")
+    private String y;//纬度
+    @ApiModelProperty("通过卡口时间")
+    private Date time;//通过卡口时间
+    @ApiModelProperty("通过卡口时间戳毫秒")
+    private String timestamp;//通过卡口时间戳毫秒
+    @ApiModelProperty("值为车牌号")
+    private String objectValue;//值为车牌号
+    @ApiModelProperty("查询开始时间")
+    private String kssj;
+    @ApiModelProperty("查询结束时间")
+    private String jssj;
+    @ApiModelProperty("卡口照片")
+    private String kkUrlPic;
+    @ApiModelProperty("设备编号")
+    private String sbbh;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("案件编号")
+    private String caseId;
+    @ApiModelProperty("案件名称")
+    private String caseName;
+    @ApiModelProperty("发送人身份证号")
+    private String username;
+    @ApiModelProperty("区域名称")
+    private String region;
+    @ApiModelProperty("伴随次数")
+    private String count;
+    @ApiModelProperty("车轨数据来源字段")
+    private String apeType;
+    @ApiModelProperty("涉案标准")
+    private String sabz;
+    @ApiModelProperty("车轨数据来源字段名称")
+    private String apeTypeMc;
+}

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/CarReceiving.java

+package com.founder.commonutils.skMapEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * Created by caoyin on 2020/4/22
+ * 封装请求的参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel
+public class CarReceiving {
+    @ApiModelProperty("车牌号")
+    private String objectValue;
+    @ApiModelProperty("通过卡口开始时间")
+    private String kssj;
+    @ApiModelProperty("通过卡口结束时间")
+    private String jssj;
+    @ApiModelProperty("对象类型")
+    private String objectType;
+    @ApiModelProperty("案件编号")
+    private String caseId;
+    @ApiModelProperty("案件名称")
+    private String caseName;
+    @ApiModelProperty("发送人身份证号")
+    private String username;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("区域名称")
+    private String region;
+    private List<CarKkInfo> lists;
+}

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/CarRy.java

+package com.founder.commonutils.skMapEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * Created by yangyang on 2020/4/23
+ * 封装请求的参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel
+public class CarRy {
+    @ApiModelProperty("姓名")
+    private String xm;
+    @ApiModelProperty("民族")
+    private String mz;
+    @ApiModelProperty("性别")
+    private String xb;
+    @ApiModelProperty("身份证号码")
+    private String sfzhm;
+    @ApiModelProperty("出生地址名称")
+    private String csdzmc;
+    @ApiModelProperty("现住址地址名称")
+    private String xzzdzmc;
+    @ApiModelProperty("照片")
+    private String img;
+    @ApiModelProperty("电话")
+    private String phone;
+    @ApiModelProperty("值为车牌号")
+    private String objValue;
+    @ApiModelProperty("车辆_品牌型号")
+    private String carType;
+    @ApiModelProperty("户籍地")
+    private String hjdqhdz;
+    @ApiModelProperty("出生日期")
+    private String csrq;
+}

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/QgjdcModel.java

+package com.founder.commonutils.skMapEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@SuppressWarnings("serial")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class QgjdcModel {
+
+    // 初次登记日期
+    private String swsj = null;
+
+    // 出厂日期
+    private String ccrq = null;
+
+    // 车辆类型
+    private String cllx = null;
+
+    // 车辆品牌1
+    private String clpp1 = null;
+
+    // 车辆品牌2
+    private String clpp2 = null;
+
+    // 车辆识别代号
+    private String clsbdh = null;
+
+    // 车辆型号
+    private String clxh = null;
+
+    // 车身颜色
+    private String csys = null;
+
+    // 登记证书编号
+    private String djzsbh = null;
+
+    // 登记住址详址
+    private String djzzxz = null;
+
+    // 发动机号
+    private String fdjh = null;
+
+    // 发动机型号
+    private String fdjxh = null;
+
+    // 发牌机关
+    private String fpjg = null;
+
+    // 国产/进口
+    private String gcjk = null;
+
+    // 功率
+    private String gl = null;
+
+    // 核定载客
+    private String hdzk = null;
+
+    // 核定载重量
+    private String hdzzl = null;
+
+    // 号牌号码
+    private String hphm = null;
+
+    // 号牌种类
+    private String hpzl = null;
+
+    // 机动车所有人
+    private String jdcsyr = null;
+
+    // 机动车状态
+    private String jdczt = null;
+
+    // 联系方式
+    private String lxfs = null;
+
+    // 排量
+    private String pl = null;
+
+    // 燃料种类
+    private String rlzl = null;
+
+    // 身份证号
+    private String sfzh = null;
+
+    // 身份证件种类
+    private String sfzjzl = null;
+
+    // 准牵引质量
+    private String zqyzl = null;
+
+    // 转入日期
+    private String zrrq = null;
+
+    // 制造厂名称
+    private String zzamc = null;
+
+    // 暂住地址区划
+    private String zzdzqh = null;
+
+    // 暂住地址详址
+    private String zzdzxz = null;
+
+    // 制造国
+    private String zzg = null;
+
+    // 载重量
+    private String zzl = null;
+
+    // 暂住区划
+    private String zzqh = null;
+
+    // 暂住证/拘留证号
+    private String zzzjlzh = null;
+
+}

service/publicapi/src/main/java/com/founder/MapRedisApplication.java

+package com.founder;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+//为了让@Async注解能够生效，还需要在Spring Boot的主程序中配置@EnableAsync
+// 启用异步任务
+@EnableAsync
+//进行定时任务
+@EnableScheduling
+@MapperScan(value = "com.founder.mapper")
+//@EnableDiscoveryClient
+@SpringBootApplication
+public class MapRedisApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(MapRedisApplication.class, args);
+	}
+
+}

service/publicapi/src/main/java/com/founder/mapper/oracle/SysDictitemMapper.java

+package com.founder.mapper.oracle;
+
+
+import java.util.Map;
+
+
+public interface SysDictitemMapper {
+    String getNameByCode(Map<String, String> map);
+}

service/publicapi/src/main/java/com/founder/service/SysDictitemService.java

+package com.founder.service;
+
+import java.util.Map;
+
+/**
+ * @author caoyin
+ */
+public interface SysDictitemService {
+ String getNameByCode(Map<String, String> map);
+
+}

service/publicapi/src/main/java/com/founder/service/serviceimpl/SysDictitemServiceImpl.java

+package com.founder.service.serviceimpl;
+
+
+import com.founder.mapper.oracle.SysDictitemMapper;
+import com.founder.service.SysDictitemService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@Service
+public class SysDictitemServiceImpl implements SysDictitemService {
+    private static final Logger logger = LoggerFactory.getLogger(SysDictitemServiceImpl.class);
+    @Resource
+    private SysDictitemMapper sysDictitemMapper;
+
+
+    /**
+     * 根据code和groupid查询name值
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public String getNameByCode(Map<String,String> map){
+        return sysDictitemMapper.getNameByCode(map);
+    }
+}

service/publicapi/src/main/resources/application-dev.properties

+# oracleݿ
+spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.url=jdbc:oracle:thin:@68.174.69.94:1521:XZXT
+spring.datasource.username=MAPZY
+spring.datasource.password=MapZy#44
\ No newline at end of file

service/publicapi/src/main/resources/application-pro.properties

+# oracleݿ
+spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.url=jdbc:oracle:thin:@47.92.129.99:1600:orcl
+spring.datasource.username=XZXT
+spring.datasource.password=XZXT
\ No newline at end of file

service/publicapi/src/main/resources/application.properties

+# 服务端口
+server.port=8001
+# 服务名
+spring.application.name=asj
+
+# 环境设置：dev、test、prod
+spring.profiles.active=dev
+
+#返回json的全局时间格式
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+
+#配置mapper xml文件的路径
+mybatis-plus.mapper-locations=classpath:mybatis/mapper/oracle/*.xml
+
+# 设置日志级别
+#logging.level.root=INFO
+#mybatis日志
+#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file

service/publicapi/src/main/resources/mybatis/mapper/oracle/SysDictitemMapper.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.mapper.oracle.SysDictitemMapper">
+
+    <!-- 根据code和groupid查询name值-->
+    <select id="getNameByCode" parameterType="java.util.Map" resultType="java.lang.String">
+        select name from SYS_DICTITEM where scbz='0'
+        <if test="groupid!=null and groupid!=''">and groupid = #{groupid}</if>
+        <if test="code!=null and code!=''">and code = #{code}</if>
+    </select>
+</mapper>
\ No newline at end of file

service/publicapi/src/main/resources/mybatis/mybatis-config.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+
+    <settings>
+        <setting name="mapUnderscoreToCamelCase" value="true"/>
+    </settings>
+</configuration>
\ No newline at end of file