From d1d50c90369a1e20ca2d8ef5cf6a33ab31275d68 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Thu, 19 Mar 2020 12:13:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=AD=BE=E5=88=B0=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/health/bean/dto/ClockDto.java | 6 +-- .../ccsens/health/bean/dto/JourneyDto.java | 6 +-- .../health/bean/po/JourneyAbnormal.java | 8 ++-- .../bean/po/JourneyAbnormalExample.java | 30 +++++--------- .../persist/dao/JourneyAbnormalDao.java | 5 +++ .../health/service/AbnormalService.java | 1 + .../ccsens/health/service/ClockService.java | 3 +- .../health/service/IJourneyService.java | 2 +- .../ccsens/health/service/JourneyService.java | 35 ++++++++++++++-- health/src/main/resources/application.yml | 4 +- .../mapper_dao/HealthAbnormalDao.xml | 5 ++- .../mapper_dao/JourneyAbnormalDao.xml | 40 +++++++++++++++++++ .../mapper_raw/JourneyAbnormalMapper.xml | 14 +++---- 13 files changed, 112 insertions(+), 47 deletions(-) create mode 100644 health/src/main/resources/mapper_dao/JourneyAbnormalDao.xml diff --git a/health/src/main/java/com/ccsens/health/bean/dto/ClockDto.java b/health/src/main/java/com/ccsens/health/bean/dto/ClockDto.java index acf44270..4e79f442 100644 --- a/health/src/main/java/com/ccsens/health/bean/dto/ClockDto.java +++ b/health/src/main/java/com/ccsens/health/bean/dto/ClockDto.java @@ -12,9 +12,9 @@ public class ClockDto { @Data @ApiModel("场景id") public static class SiteDto{ - @NotNull - @ApiModelProperty("token") - private Long token; +// @NotNull +// @ApiModelProperty("token") +// private Long token; @NotNull @ApiModelProperty("场景二维码id") private Long siteId; diff --git a/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java b/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java index ae205255..05279072 100644 --- a/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java +++ b/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java @@ -162,7 +162,7 @@ public class JourneyDto { @ApiModel("查询异常行程") public static class SelectAbnormalJourney { @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他") - private int tripMode; + private Integer tripMode; @ApiModelProperty("车次号") private String carNo; @ApiModelProperty("出发时间") @@ -170,7 +170,7 @@ public class JourneyDto { @ApiModelProperty("到达时间") private Long endTime; @ApiModelProperty("分页") - private int page; + private Integer page; } @Data @@ -180,7 +180,7 @@ public class JourneyDto { @ApiModelProperty("id") private Long id; @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他") - private int tripMode; + private Integer tripMode; @ApiModelProperty("车次号") private String carNo; @ApiModelProperty("出发时间") diff --git a/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormal.java b/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormal.java index 3a642d2c..a477d25f 100644 --- a/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormal.java +++ b/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormal.java @@ -6,7 +6,7 @@ import java.util.Date; public class JourneyAbnormal implements Serializable { private Long id; - private String tripMode; + private Byte tripMode; private String carNo; @@ -32,12 +32,12 @@ public class JourneyAbnormal implements Serializable { this.id = id; } - public String getTripMode() { + public Byte getTripMode() { return tripMode; } - public void setTripMode(String tripMode) { - this.tripMode = tripMode == null ? null : tripMode.trim(); + public void setTripMode(Byte tripMode) { + this.tripMode = tripMode; } public String getCarNo() { diff --git a/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormalExample.java b/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormalExample.java index 4f6b739d..02b1563d 100644 --- a/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormalExample.java +++ b/health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormalExample.java @@ -175,62 +175,52 @@ public class JourneyAbnormalExample { return (Criteria) this; } - public Criteria andTripModeEqualTo(String value) { + public Criteria andTripModeEqualTo(Byte value) { addCriterion("trip_mode =", value, "tripMode"); return (Criteria) this; } - public Criteria andTripModeNotEqualTo(String value) { + public Criteria andTripModeNotEqualTo(Byte value) { addCriterion("trip_mode <>", value, "tripMode"); return (Criteria) this; } - public Criteria andTripModeGreaterThan(String value) { + public Criteria andTripModeGreaterThan(Byte value) { addCriterion("trip_mode >", value, "tripMode"); return (Criteria) this; } - public Criteria andTripModeGreaterThanOrEqualTo(String value) { + public Criteria andTripModeGreaterThanOrEqualTo(Byte value) { addCriterion("trip_mode >=", value, "tripMode"); return (Criteria) this; } - public Criteria andTripModeLessThan(String value) { + public Criteria andTripModeLessThan(Byte value) { addCriterion("trip_mode <", value, "tripMode"); return (Criteria) this; } - public Criteria andTripModeLessThanOrEqualTo(String value) { + public Criteria andTripModeLessThanOrEqualTo(Byte value) { addCriterion("trip_mode <=", value, "tripMode"); return (Criteria) this; } - public Criteria andTripModeLike(String value) { - addCriterion("trip_mode like", value, "tripMode"); - return (Criteria) this; - } - - public Criteria andTripModeNotLike(String value) { - addCriterion("trip_mode not like", value, "tripMode"); - return (Criteria) this; - } - - public Criteria andTripModeIn(List values) { + public Criteria andTripModeIn(List values) { addCriterion("trip_mode in", values, "tripMode"); return (Criteria) this; } - public Criteria andTripModeNotIn(List values) { + public Criteria andTripModeNotIn(List values) { addCriterion("trip_mode not in", values, "tripMode"); return (Criteria) this; } - public Criteria andTripModeBetween(String value1, String value2) { + public Criteria andTripModeBetween(Byte value1, Byte value2) { addCriterion("trip_mode between", value1, value2, "tripMode"); return (Criteria) this; } - public Criteria andTripModeNotBetween(String value1, String value2) { + public Criteria andTripModeNotBetween(Byte value1, Byte value2) { addCriterion("trip_mode not between", value1, value2, "tripMode"); return (Criteria) this; } diff --git a/health/src/main/java/com/ccsens/health/persist/dao/JourneyAbnormalDao.java b/health/src/main/java/com/ccsens/health/persist/dao/JourneyAbnormalDao.java index 510338b7..335b54ff 100644 --- a/health/src/main/java/com/ccsens/health/persist/dao/JourneyAbnormalDao.java +++ b/health/src/main/java/com/ccsens/health/persist/dao/JourneyAbnormalDao.java @@ -1,8 +1,13 @@ package com.ccsens.health.persist.dao; +import com.ccsens.health.bean.vo.JourneyVo; import com.ccsens.health.persist.mapper.JourneyAbnormalMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface JourneyAbnormalDao extends JourneyAbnormalMapper { + List selectAbnormalJourney(@Param("carNo") String carNo, @Param("tripMode") int tripMode, @Param("startTime") Long startTime, @Param("endTime") Long endTime); } diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java index 3134c36f..c3fa52fa 100644 --- a/health/src/main/java/com/ccsens/health/service/AbnormalService.java +++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java @@ -36,6 +36,7 @@ public class AbnormalService implements IAbnormalService{ */ @Override public List abnormalOverview(QueryDto params) { + return null; } diff --git a/health/src/main/java/com/ccsens/health/service/ClockService.java b/health/src/main/java/com/ccsens/health/service/ClockService.java index 1b381731..4f4f0509 100644 --- a/health/src/main/java/com/ccsens/health/service/ClockService.java +++ b/health/src/main/java/com/ccsens/health/service/ClockService.java @@ -60,7 +60,8 @@ public class ClockService implements IClockService { ClockDto.SiteDto clickIn = params.getParam(); Long userId = params.getUserId(); //获取场所ID - Site site = siteDao.selectByPrimaryKey(clickIn.getSiteId()); + SiteQrcode siteQrcode = siteQrcodeDao.selectByPrimaryKey(clickIn.getSiteId()); + Site site = siteDao.selectByPrimaryKey(siteQrcode.getSiteId()); log.info("场所信息：{}", site); if (site == null) { throw new BaseException(CodeEnum.PARAM_ERROR); diff --git a/health/src/main/java/com/ccsens/health/service/IJourneyService.java b/health/src/main/java/com/ccsens/health/service/IJourneyService.java index b9806571..56c36488 100644 --- a/health/src/main/java/com/ccsens/health/service/IJourneyService.java +++ b/health/src/main/java/com/ccsens/health/service/IJourneyService.java @@ -15,7 +15,7 @@ public interface IJourneyService { void addAbnormalJourney(QueryDto params); - List selectAbnormalJourney(QueryDto params); + List selectAbnormalJourney(QueryDto params) throws Exception; void updateAbnormalJourney(QueryDto params); diff --git a/health/src/main/java/com/ccsens/health/service/JourneyService.java b/health/src/main/java/com/ccsens/health/service/JourneyService.java index 128705a6..d845622a 100644 --- a/health/src/main/java/com/ccsens/health/service/JourneyService.java +++ b/health/src/main/java/com/ccsens/health/service/JourneyService.java @@ -164,9 +164,16 @@ public class JourneyService implements IJourneyService{ * @return */ @Override - public List selectAbnormalJourney(QueryDto params) { - - return null; + public List selectAbnormalJourney(QueryDto params) throws Exception { + JourneyDto.SelectAbnormalJourney abnormalJourney = params.getParam(); + Long startTime = abnormalJourney.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : abnormalJourney.getStartTime(); + Long endTime = abnormalJourney.getEndTime() == null ? System.currentTimeMillis() : abnormalJourney.getEndTime(); + Integer page = abnormalJourney.getPage() == null ? 1 : abnormalJourney.getPage(); + PageHelper.startPage(page, 10); + List addAbnormalJourneyList = + journeyAbnormalDao.selectAbnormalJourney(abnormalJourney.getCarNo(),abnormalJourney.getTripMode(),startTime,endTime); + + return addAbnormalJourneyList; } /** @@ -175,7 +182,27 @@ public class JourneyService implements IJourneyService{ */ @Override public void updateAbnormalJourney(QueryDto params) { - + JourneyDto.UpdateAbnormalJourney journey = params.getParam(); + JourneyAbnormal journeyAbnormal = journeyAbnormalDao.selectByPrimaryKey(journey.getId()); + if(ObjectUtil.isNotNull(journeyAbnormal)){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } + if(ObjectUtil.isNotNull(journey.getTripMode())){ + journeyAbnormal.setTripMode(journey.getTripMode().byteValue()); + } + if(StrUtil.isNotEmpty(journey.getCarNo())){ + journeyAbnormal.setCarNo(journey.getCarNo()); + } + if(ObjectUtil.isNotNull(journey.getStartTime())){ + journeyAbnormal.setStartTime(journey.getStartTime()); + } + if(ObjectUtil.isNotNull(journey.getEndTime())){ + journeyAbnormal.setEndTime(journey.getEndTime()); + } + if(StrUtil.isNotEmpty(journey.getDescription())){ + journeyAbnormal.setDescription(journey.getDescription()); + } + journeyAbnormalDao.updateByPrimaryKeySelective(journeyAbnormal); } /** diff --git a/health/src/main/resources/application.yml b/health/src/main/resources/application.yml index 5889ff7f..5c2cd5c4 100644 --- a/health/src/main/resources/application.yml +++ b/health/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml b/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml index 969a12e4..460837d5 100644 --- a/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml +++ b/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml @@ -30,11 +30,11 @@ where a.rec_status = 0 - and + and m.type != 2 - and + and m.type = 2 @@ -42,6 +42,7 @@ a.department = #{department} + and a.health_status = #{healthType} diff --git a/health/src/main/resources/mapper_dao/JourneyAbnormalDao.xml b/health/src/main/resources/mapper_dao/JourneyAbnormalDao.xml new file mode 100644 index 00000000..95acfed2 --- /dev/null +++ b/health/src/main/resources/mapper_dao/JourneyAbnormalDao.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/health/src/main/resources/mapper_raw/JourneyAbnormalMapper.xml b/health/src/main/resources/mapper_raw/JourneyAbnormalMapper.xml index 500148ca..7afa6593 100644 --- a/health/src/main/resources/mapper_raw/JourneyAbnormalMapper.xml +++ b/health/src/main/resources/mapper_raw/JourneyAbnormalMapper.xml @@ -3,7 +3,7 @@ - + @@ -109,7 +109,7 @@ start_time, end_time, description, created_at, updated_at, rec_status ) - values (#{id,jdbcType=BIGINT}, #{tripMode,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, + values (#{id,jdbcType=BIGINT}, #{tripMode,jdbcType=TINYINT}, #{carNo,jdbcType=VARCHAR}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{description,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} ) @@ -150,7 +150,7 @@ #{id,jdbcType=BIGINT}, - #{tripMode,jdbcType=VARCHAR}, + #{tripMode,jdbcType=TINYINT}, #{carNo,jdbcType=VARCHAR}, @@ -188,7 +188,7 @@ id = #{record.id,jdbcType=BIGINT}, - trip_mode = #{record.tripMode,jdbcType=VARCHAR}, + trip_mode = #{record.tripMode,jdbcType=TINYINT}, car_no = #{record.carNo,jdbcType=VARCHAR}, @@ -219,7 +219,7 @@ update t_journey_abnormal set id = #{record.id,jdbcType=BIGINT}, - trip_mode = #{record.tripMode,jdbcType=VARCHAR}, + trip_mode = #{record.tripMode,jdbcType=TINYINT}, car_no = #{record.carNo,jdbcType=VARCHAR}, start_time = #{record.startTime,jdbcType=BIGINT}, end_time = #{record.endTime,jdbcType=BIGINT}, @@ -235,7 +235,7 @@ update t_journey_abnormal - trip_mode = #{tripMode,jdbcType=VARCHAR}, + trip_mode = #{tripMode,jdbcType=TINYINT}, car_no = #{carNo,jdbcType=VARCHAR}, @@ -263,7 +263,7 @@ update t_journey_abnormal - set trip_mode = #{tripMode,jdbcType=VARCHAR}, + set trip_mode = #{tripMode,jdbcType=TINYINT}, car_no = #{carNo,jdbcType=VARCHAR}, start_time = #{startTime,jdbcType=BIGINT}, end_time = #{endTime,jdbcType=BIGINT},