Skip to content

M
map-parent
Commit edc63157 by chentian
Options

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

# Conflicts:
#	common/common_utils/src/main/java/com/founder/commonutils/publicEntity/Receiving.java
parents 338eed96 595683fc
Showing with 899 additions and 12 deletions
common/common_utils/pom.xml
...@@ -9,4 +9,10 @@ ...@@ -9,4 +9,10 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>common_utils</artifactId> <artifactId>common_utils</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarKkInfo.java 0 → 100644
package com.founder.commonutils.carEntity;
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/carEntity/CarReceiving.java 0 → 100644
package com.founder.commonutils.carEntity;
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/carEntity/CarRy.java 0 → 100644
package com.founder.commonutils.carEntity;
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/carEntity/QgjdcModel.java 0 → 100644
package com.founder.commonutils.carEntity;
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;
}
common/common_utils/src/main/java/com/founder/commonutils/publicEntity/RyReceiving.java 0 → 100644
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/pom.xml
...@@ -21,6 +21,17 @@ ...@@ -21,6 +21,17 @@
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<scope>provided </scope> <scope>provided </scope>
</dependency> </dependency>
<!--spring切面aop依赖-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!-- json解析依赖 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.47</version>
</dependency>
<!--mybatis-plus--> <!--mybatis-plus-->
<dependency> <dependency>
......
common/service_base/src/main/java/com/founder/servicebase/logs/OperLog.java 0 → 100644
package com.founder.servicebase.logs;
import java.lang.annotation.*;
/**
* 自定义注解类 OperLog
* Created by LMD on 2019/3/22.
*/
@Target(ElementType.METHOD) //注解放置的目标位置,METHOD是可注解在方法级别上
@Retention(RetentionPolicy.RUNTIME) //注解在哪个阶段执行
@Documented //生成文档
public @interface OperLog {
String message(); // 介绍
String operation(); // 日志类型
}
common/service_base/src/main/java/com/founder/servicebase/logs/OperationType.java 0 → 100644
package com.founder.servicebase.logs;
/**
* 操作类型类 OperationType
* Created by LMD on 2019/3/22.
*/
public class OperationType {
/**
* 添加
*/
public static final String ADD = "ADD";
/**
* 删除
*/
public static final String DELETE = "DELETE";
/**
* 更新
*/
public static final String UPDATE = "UPDATE";
/**
* 查询
*/
public static final String QUERY = "QUERY";
/**
* 登录
*/
public static final String LOGIN = "LOGIN";
/**
* 退出登录
*/
public static final String LOGOUT = "LOGOUT";
}
common/service_base/src/main/java/com/founder/servicebase/logs/SysLog.java 0 → 100644
package com.founder.servicebase.logs;
import lombok.Data;
import java.io.Serializable;
/**
* 日志实体类 SysLog
* Created by LMD on 2019/3/22.
*/
@Data
public class SysLog implements Serializable {
private Long id; //
private String userId; // 操作用户 ID
private String message; // 消息
private String operation; // 日志类型
private String method; // 请求方法
private String params; // 请求参数
private String ip; // 请求IP
private String createDate;// 请求时间
private Long totalTime; //总耗时长（毫秒）
private String content; // 返回值
//添加set和get方法
}
\ No newline at end of file
common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java 0 → 100644
package com.founder.servicebase.logs;
import lombok.SneakyThrows;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.CodeSignature;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
*
* 系统日志：切面处理类
*
* Created by LMD on 2019/3/22.
*/
@Aspect
@Component
public class SysLogAspect {
private static Logger LOG = LoggerFactory.getLogger(SysLogAspect.class);
//定义切点 @Pointcut
//在注解的位置切入代码
@Pointcut("@annotation( com.founder.servicebase.logs.OperLog)")
public void logPoinCut() {
}
//@Around：环绕通知
@SneakyThrows
@Around("logPoinCut()")
public Object saveSysLog(ProceedingJoinPoint proceedingJoinPoint) {
System.out.println("环绕通知开始。。。。。");
//保存日志
SysLog sysLog = new SysLog();
//从切面织入点处通过反射机制获取织入点处的方法
MethodSignature signature = (MethodSignature) proceedingJoinPoint.getSignature();
//获取切入点所在的方法
Method method = signature.getMethod();
//获取操作
OperLog myLog = method.getAnnotation(OperLog.class);
if (myLog != null) {
String value = myLog.message();
sysLog.setMessage(value);//保存获取的操作
}
//获取请求的类名
String className = proceedingJoinPoint.getTarget().getClass().getName();
//获取请求的方法名
String methodName = method.getName();
sysLog.setMethod(className + "." + methodName);
//请求参数 和对应的值
Map<String, Object> map=getNameAndValue(proceedingJoinPoint);
sysLog.setParams(map.toString());
//请求时间
Date date = new Date();
String pattern = "yyyy-MM-dd HH:mm:ss";
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
sysLog.setCreateDate(simpleDateFormat.format(date));
//获取用户名
//获取用户ip地址
// 接收到请求，记录请求内容
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
// 记录下请求内容
LOG.info("URL : " + request.getRequestURL().toString());
LOG.info("HTTP_METHOD : " + request.getMethod());
LOG.info("IP : " + request.getRemoteAddr());
sysLog.setIp(request.getRemoteAddr());
//开始调用时间
// 计时并调用目标函数
long start = System.currentTimeMillis();
Long time = System.currentTimeMillis() - start;
sysLog.setTotalTime(time);
try {
Object result = proceedingJoinPoint.proceed();
if(!StringUtils.isEmpty(result)){
sysLog.setContent(result.toString());
}
} catch (Throwable throwable) {
String erro="";
throwable.printStackTrace();
erro=log(throwable);
sysLog.setContent(erro);
}
System.out.print("保存数据库=="+sysLog.toString());
//调用service保存SysLog实体类到数据库
//sysLogService.save(sysLog);
return null;
}
/**
* 获取参数Map集合
* @param joinPoint
* @return
*/
Map<String, Object> getNameAndValue(ProceedingJoinPoint joinPoint) {
Map<String, Object> param = new HashMap<>();
Object[] paramValues = joinPoint.getArgs();
String[] paramNames = ((CodeSignature)joinPoint.getSignature()).getParameterNames();
for (int i = 0; i < paramNames.length; i++) {
param.put(paramNames[i], paramValues[i]);
}
return param;
}
/**
* @Desc: 异常打印日志 ，提供给打印非正常异常
* @Author HealerJean
* @Date 2018/8/21 下午6:41.
*/
public static String log(Throwable e){
StackTraceElement s= e.getStackTrace()[0];//数组长度为 1
String content= ("\n\n-----------------" +
"\n报错文件名:" + s.getFileName() +
"\n报错的类：" + s.getClassName() +
"\n报错方法：：" + s.getMethodName() +
"\n报错的行：" + s.getLineNumber() +
"\n报错的message：" + e.getMessage() +
"\n------------------\n\n");
System.out.println("111111111111111"+content);
return content;
}
}
pom.xml
...@@ -106,11 +106,11 @@ ...@@ -106,11 +106,11 @@
</dependency> </dependency>
<!--aliyunOSS--> <!--aliyunOSS-->
<dependency> <!--<dependency>
<groupId>com.aliyun.oss</groupId> <groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId> <artifactId>aliyun-sdk-oss</artifactId>
<version>${aliyun.oss.version}</version> <version>${aliyun.oss.version}</version>
</dependency> </dependency>-->
<!--日期时间工具--> <!--日期时间工具-->
<dependency> <dependency>
...@@ -182,16 +182,16 @@ ...@@ -182,16 +182,16 @@
<artifactId>aliyun-java-sdk-vod</artifactId> <artifactId>aliyun-java-sdk-vod</artifactId>
<version>${aliyun-java-sdk-vod.version}</version> <version>${aliyun-java-sdk-vod.version}</version>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>aliyun-java-vod-upload</artifactId> <artifactId>aliyun-java-vod-upload</artifactId>
<version>${aliyun-java-vod-upload.version}</version> <version>${aliyun-java-vod-upload.version}</version>
</dependency> </dependency>-->
<dependency> <!--<dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>aliyun-sdk-vod-upload</artifactId> <artifactId>aliyun-sdk-vod-upload</artifactId>
<version>${aliyun-sdk-vod-upload.version}</version> <version>${aliyun-sdk-vod-upload.version}</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
......
service/asj/src/main/java/com/founder/asj/controller/TbStAsjController.java
...@@ -10,10 +10,12 @@ import com.founder.commonutils.asjEntity.AsjQuery; ...@@ -10,10 +10,12 @@ import com.founder.commonutils.asjEntity.AsjQuery;
import com.founder.commonutils.asjEntity.CbxszAndXlaj; import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.TbStAsj; import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.R; import com.founder.commonutils.publicEntity.R;
import com.founder.commonutils.publicEntity.Receiving;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -38,6 +40,18 @@ public class TbStAsjController { ...@@ -38,6 +40,18 @@ public class TbStAsjController {
@Autowired @Autowired
private TbStAsjService tbStAsjService; private TbStAsjService tbStAsjService;
@Value("${ssdw}")
private String ssdw;
//案件查询（存储reids）
@ApiOperation(value = "获取同类案件信息//案件查询（存储reids）")
@PostMapping("/ajxx")
public R selectAsjxx(@RequestBody Receiving receiving) {
receiving.setSsdw(ssdw);//设置所属单位，用于案件类别代码转译
//return tbStAsjService.selectAsjxxList(receiving);
List<TbStAsj> asjList = tbStAsjService.selectAsjxxList(receiving);
return R.ok().data("data",asjList);
}
@ApiOperation(value = "按条件查询案件") @ApiOperation(value = "按条件查询案件")
@PostMapping("getAsj") @PostMapping("getAsj")
public R getAsj(@RequestBody AsjQuery asjQuery) { public R getAsj(@RequestBody AsjQuery asjQuery) {
...@@ -126,7 +140,7 @@ public class TbStAsjController { ...@@ -126,7 +140,7 @@ public class TbStAsjController {
} }
} }
@ApiOperation(value = "获取同类案件信息") /*@ApiOperation(value = "获取同类案件信息")
@PostMapping("getTlajxx") @PostMapping("getTlajxx")
public R get(@RequestBody AsjQuery asjQuery) { public R get(@RequestBody AsjQuery asjQuery) {
QueryWrapper<TbStAsj> wrapperByasjbh = new QueryWrapper<>(); QueryWrapper<TbStAsj> wrapperByasjbh = new QueryWrapper<>();
...@@ -164,7 +178,7 @@ public class TbStAsjController { ...@@ -164,7 +178,7 @@ public class TbStAsjController {
} }
List<TbStAsj> list = tbStAsjService.list(wrapper); List<TbStAsj> list = tbStAsjService.list(wrapper);
return R.ok().data("asj", list); return R.ok().data("asj", list);
} }*/
// 查询案事件标注信息 // 查询案事件标注信息
@ApiOperation(value = "获取串并线索组信息") @ApiOperation(value = "获取串并线索组信息")
......
service/asj/src/main/java/com/founder/asj/mapper/TbStAsjMapper.java
...@@ -4,6 +4,7 @@ package com.founder.asj.mapper; ...@@ -4,6 +4,7 @@ package com.founder.asj.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.asjEntity.CbxszAndXlaj; import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.TbStAsj; import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.Receiving;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -30,4 +31,6 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> { ...@@ -30,4 +31,6 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
List<CbxszAndXlaj> GetlistCbzXgaj(Map map); List<CbxszAndXlaj> GetlistCbzXgaj(Map map);
String getNameByCode(Map<String,String> map); String getNameByCode(Map<String,String> map);
List<TbStAsj> selectAsjxxByReceivingList(Receiving receiving);
} }
service/asj/src/main/java/com/founder/asj/mapper/xml/TbStAsjMapper.xml
...@@ -69,4 +69,198 @@ ...@@ -69,4 +69,198 @@
<if test="groupid!=null and groupid!=''">and groupid = #{groupid}</if> <if test="groupid!=null and groupid!=''">and groupid = #{groupid}</if>
<if test="code!=null and code!=''">and code = #{code}</if> <if test="code!=null and code!=''">and code = #{code}</if>
</select> </select>
<select id="selectAsjxxByReceivingList" parameterType="com.founder.commonutils.publicEntity.Receiving" resultType="com.founder.commonutils.asjEntity.TbStAsj">
SELECT
KYMYQZ_WPSL
,T.ASJBH
,KYZZQZ_WPSL
,KYFZQZ_WPSL
,KYQTQZ_WPSL
,SLSJ
,SLDW_GAJGJGDM
,SLDW_GAJGMC
,LARQ
,LADW_GAJGJGDM
,LADW_GAJGMC
,ZARY_RS
,SJCWJZRMBY
,ZCZJ_ZCXWYJMS
,ZCZJ_ZXSJ01
,ZCZJDW_GAJGJGDM
,ZCZJDW_GAJGMC
,YSSCQSRQ
,YSSCQSAJSCFHJDDM
,SFCXAJ_PDBZ
,CXAJYYDM
,CXAJDW_GAJGJGDM
,CXAJDW_GAJGMC
,CXAJRQ
,XSAJXSGZJGDM
,ZBR_XM
,ZBR_GMSFHM
,ZBR_LXDH
,XBR_XM
,XBR_GMSFHM
,XBR_LXDH
,XSJSFZR_XM
,XSJSFZR_GMSFHM
,XSJSFZR_LXDH
,GAJGFZR_XM
,GAJGFZR_GMSFHM
,GAJGFZR_LXDH
,T.JJBH
,XCKYBH
,ASJLYDM
,XSJQLBDM
,ZCJDDM
,XSAJLASCJGDM
,AJLBDM
,ZATZ_JYQK
,TSSDDM
,ZATZZDFL_JYQK
,ZATZBCMS_JYQK
,ZATZ_AJZATZJHBD
,AJMC
,FXASJSJ
,FXASJDD_XZQHDM
,FXASJDD_DZMC
,ASJFSSJ_ASJFSKSSJ
,ASJFSSJ_ASJFSJSSJ
,ASJFSSJ_RSDDM
,ASJFSSJ_ZASJ_ZASJLBDM
,ASJFSSJ_ZASJ_DMBCMS
,ASJFSDD_XZQHDM
,ASJFSDD_DZMC
,ASJFSDD_DQJD
,ASJFSDD_DQWD
,ASJFSDD_DQJD as x
,ASJFSDD_DQWD as y
,ASJFSDD_DYLBDM
,ASJFSDD_SACS_SACSLBDM
,ASJFSDD_SACS_DMBCMS
,ASJFSDD_KJBW_KJBWLBDM
,ASJFSDD_KJBW_DMBCMS
,ASJFSDD_SFJZWN_PDBZ
,ASJFSDD_JZWCS
,ASJFSDD_ASJFSLC
,ASJFSDD_SFZLZZ_PDBZ
,JYAQ
,SFSQ_PDBZ
,SFSB_PDBZ
,SFMA_PDBZ
,SFSH_PDBZ
,SFSJDQPCL_PDBZ
,SFSW_PDBZ
,SFGM_PDBZ
,SWASJSWQK
,ASJDBJBDM
,LLFS_LLFSDM
,LLFS_DMBCMS
,LLSJ
,SY_JYQK
,FZXYRTSXW_FZXYRTSXWDM
,FZXYRTSXW_DMBCMS
,FZXYRSXZAHJQK
,QTSDTD_JYQK
,ASJFSSJFX_ASJFSKSSJ
,ASJFSSJFX_ASJFSJSSJ
,ZARFX_RSXX
,ZARFX_RSSX
,FZXYRTZ_JYQK
,FZXYRTSZC_FZXYRTSZCDM
,FZXYRTSZC_DMBCMS
,ZAGJ_SAWPDM
,ZAGJ_JYQK
,ZADJMS
,ZAMDMS
,KJFWDM
,LCZA_JYQK
,JHZA_JYQK
,GTFZFZXYRZHXSDM
,GTFZFZXYRGC_GTFZFZXYRGCDM
,GTFZFZXYRGC_DMBCMS
,XZWPFX_SAWP_SAWPDM
,XZWPFX_SAWP_DMBCMS
,SSWPQX_JYQK
,FZXYRYLWP_JYQK
,XCKYWP_JYQK
,FXXS_JYQK
,ASJSWRY_RS
,ASJSSRY_RS
,ASJSSCW_JYQK
,SSJZRMBY
,KYZSQZ_WPSL
,JJSD_JJSDDM
,JSSD_JSSDDM
,ZPSD_ZPSDDM
,LKJZKJFS_LKJZKJFSDM
,ZAZBSD_ZAZBSDDM
,JRJZKJFSJSD_JRJZKJFSJSDDM
<if test="ssdw != '441900000000'">
,(select name from sys_dictitem where groupid='CODE_AJLB' and code=T.ajlbdm) as ajlbdmStr
</if>
<if test="ssdw == '441900000000'">
,(case
when T.ajlx_dg='01' then (select name from sys_dictitem where groupid='CODE_AJLB' and code=T.ajlbdm)
when T.ajlx_dg!='01' then (select name from sys_dictitem where groupid='CODE_DG_AJ_AB' and code=T.AB_DG)
else '' end ) as ajlbdmStr
</if>
FROM tb_st_asj T WHERE 1=1
<include refid="queryWhereByReceiving"/>
</select>
<sql id="queryWhereByReceiving">
<if test="asjbh!= null">
AND T.ASJBH= #{ asjbh , jdbcType=VARCHAR }
</if>
<if test="ajlbdm!= null">
AND T.AJLBDM= #{ ajlbdm , jdbcType=VARCHAR }
</if>
<if test="jyaq!= null">
AND T.JYAQ LIKE '%' || #{jyaq , jdbcType=VARCHAR } || '%'
</if>
<if test="asjfssj_asjfskssj_start!= null">
AND T.ASJFSSJ_ASJFSKSSJ <![CDATA[>=]]> to_date(#{asjfssj_asjfskssj_start},'yyyy-MM-dd hh24:mi:ss')
</if>
<if test="asjfssj_asjfskssj_end!= null">
AND T.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{asjfssj_asjfskssj_end},'yyyy-MM-dd hh24:mi:ss')
</if>
<if test="ajslsj_start!= null">
AND T.SLSJ <![CDATA[>=]]> to_date(#{ajslsj_start},'yyyy-MM-dd hh24:mi:ss')
</if>
<if test="ajslsj_end!= null">
AND T.SLSJ <![CDATA[<]]> to_date(#{ajslsj_end},'yyyy-MM-dd hh24:mi:ss')
</if>
<if test="larq_start!= null">
AND T.LARQ <![CDATA[>=]]> to_date(#{larq_start},'yyyy-MM-dd hh24:mi:ss')
</if>
<if test="larq_end!= null">
AND T.LARQ <![CDATA[<]]> to_date(#{larq_end},'yyyy-MM-dd hh24:mi:ss')
</if>
<if test="ladw_gajgjgdm!= null">
AND T.LADW_GAJGJGDM= #{ ladw_gajgjgdm , jdbcType=VARCHAR }
</if>
<if test="afdxzqhdm!= null">
AND T.ASJFSDD_XZQHDM= #{ afdxzqhdm , jdbcType=VARCHAR }
</if>
<if test="asjfsd_dzmc!= null">
AND T.ASJFSDD_DZMC LIKE '%' || #{asjfsd_dzmc , jdbcType=VARCHAR } || '%'
</if>
<if test="x!= null and x!=0.0">
AND T.ASJFSDD_DQJD= #{ x , jdbcType=DOUBLE }
</if>
<if test="y!= null and y!=0.0">
AND T.ASJFSDD_DQWD= #{ y , jdbcType=DOUBLE }
</if>
<if test="zcjddm!= null">
AND T.ZCJDDM= #{ zcjddm , jdbcType=VARCHAR }
</if>
<if test="xckybh!= null">
AND T.XCKYBH= #{ xckybh , jdbcType=VARCHAR }
</if>
</sql>
</mapper> </mapper>
service/asj/src/main/java/com/founder/asj/service/TbStAsjService.java
...@@ -4,6 +4,7 @@ package com.founder.asj.service; ...@@ -4,6 +4,7 @@ package com.founder.asj.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.asjEntity.CbxszAndXlaj; import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.TbStAsj; import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.Receiving;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -27,4 +28,6 @@ public interface TbStAsjService extends IService<TbStAsj> { ...@@ -27,4 +28,6 @@ public interface TbStAsjService extends IService<TbStAsj> {
List<CbxszAndXlaj> GetlistCbzXgaj(Map map); List<CbxszAndXlaj> GetlistCbzXgaj(Map map);
String getNameByCode(Map<String,String> map); String getNameByCode(Map<String,String> map);
List<TbStAsj> selectAsjxxList(Receiving receiving);
} }
service/asj/src/main/java/com/founder/asj/service/impl/TbStAsjServiceImpl.java
...@@ -6,6 +6,7 @@ import com.founder.asj.mapper.TbStAsjMapper; ...@@ -6,6 +6,7 @@ import com.founder.asj.mapper.TbStAsjMapper;
import com.founder.asj.service.TbStAsjService; import com.founder.asj.service.TbStAsjService;
import com.founder.commonutils.asjEntity.CbxszAndXlaj; import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.TbStAsj; import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.Receiving;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -50,4 +51,9 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl ...@@ -50,4 +51,9 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
public String getNameByCode(Map<String,String> map){ public String getNameByCode(Map<String,String> map){
return tbStAsjMapper.getNameByCode(map); return tbStAsjMapper.getNameByCode(map);
} }
@Override
public List<TbStAsj> selectAsjxxList(Receiving receiving) {
return tbStAsjMapper.selectAsjxxByReceivingList(receiving);
}
} }
service/asj/src/main/resources/application.properties
...@@ -12,6 +12,8 @@ spring.jackson.time-zone=GMT+8 ...@@ -12,6 +12,8 @@ spring.jackson.time-zone=GMT+8
#配置mapper xml文件的路径 #配置mapper xml文件的路径
mybatis-plus.mapper-locations=classpath:com/founder/asj/mapper/xml/*.xml mybatis-plus.mapper-locations=classpath:com/founder/asj/mapper/xml/*.xml
#所属单位,东莞与其他单位所有案件类别字典可能有所差异，故需要加单位进行判断（东莞441900000000）
ssdw=441900000000
# 设置日志级别 # 设置日志级别
#logging.level.root=INFO #logging.level.root=INFO
......
service/logs/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>service</artifactId>
<groupId>com.founder</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>logs</artifactId>
<build>
<finalName>logs</finalName>
</build>
</project>
\ No newline at end of file
service/pom.xml
...@@ -58,8 +58,11 @@ ...@@ -58,8 +58,11 @@
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
</dependency> </dependency>
<!-- 数据库驱动包 --> <dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.0.0</version>
</dependency>
<!--mysql--> <!--mysql-->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
......
service/publicapi/pom.xml
...@@ -11,5 +11,4 @@ ...@@ -11,5 +11,4 @@
<artifactId>publicapi</artifactId> <artifactId>publicapi</artifactId>
</project> </project>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/pulicapi/MapRedisApplication.java 0 → 100644
package com.founder.pulicapi;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = {"com.founder"})
public class MapRedisApplication {
public static void main(String[] args) {
SpringApplication.run(MapRedisApplication.class, args);
}
}
service/publicapi/src/main/java/com/founder/pulicapi/mapper/SysDictitemMapper.java 0 → 100644
package com.founder.pulicapi.mapper;
import java.util.Map;
public interface SysDictitemMapper {
String getNameByCode(Map<String, String> map);
}
service/publicapi/src/main/java/com/founder/pulicapi/service/SysDictitemService.java 0 → 100644
package com.founder.pulicapi.service;
import java.util.Map;
/**
* @author caoyin
*/
public interface SysDictitemService {
String getNameByCode(Map<String, String> map);
}
service/publicapi/src/main/java/com/founder/pulicapi/service/serviceimpl/SysDictitemServiceImpl.java 0 → 100644
package com.founder.pulicapi.service.serviceimpl;
import com.founder.pulicapi.mapper.SysDictitemMapper;
import com.founder.pulicapi.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 0 → 100644
# 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 0 → 100644
# 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 0 → 100644
# 服务端口
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 0 → 100644
<?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.pulicapi.mapper.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 0 → 100644
<?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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment