去掉签到参数的token

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;

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("出发时间")

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() {

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<String> values) {
+        public Criteria andTripModeIn(List<Byte> values) {
             addCriterion("trip_mode in", values, "tripMode");
             return (Criteria) this;
         }
 
-        public Criteria andTripModeNotIn(List<String> values) {
+        public Criteria andTripModeNotIn(List<Byte> 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;
         }

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<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(@Param("carNo") String carNo, @Param("tripMode") int tripMode, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 }

health/src/main/java/com/ccsens/health/service/AbnormalService.java

@@ -36,6 +36,7 @@ public class AbnormalService implements IAbnormalService{
      */
     @Override
     public List<AbnormalVo.AbnormalOverview> abnormalOverview(QueryDto<AbnormalDto.SelectAbnormal> params) {
+
         return null;
     }
 

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);

health/src/main/java/com/ccsens/health/service/IJourneyService.java

@@ -15,7 +15,7 @@ public interface IJourneyService {
 
     void addAbnormalJourney(QueryDto<JourneyDto.AddAbnormalJourney> params);
 
-    List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(QueryDto<JourneyDto.SelectAbnormalJourney> params);
+    List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(QueryDto<JourneyDto.SelectAbnormalJourney> params) throws Exception;
 
     void updateAbnormalJourney(QueryDto<JourneyDto.UpdateAbnormalJourney> params);
 

health/src/main/java/com/ccsens/health/service/JourneyService.java

@@ -164,9 +164,16 @@ public class JourneyService implements IJourneyService{
      * @return
      */
     @Override
-    public List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(QueryDto<JourneyDto.SelectAbnormalJourney> params) {
-
-        return null;
+    public List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(QueryDto<JourneyDto.SelectAbnormalJourney> 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<JourneyVo.AddAbnormalJourney> 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<JourneyDto.UpdateAbnormalJourney> 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);
     }
 
     /**

health/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev

health/src/main/resources/mapper_dao/HealthAbnormalDao.xml

@@ -42,6 +42,7 @@
             a.department = #{department}
         </if>
         <if test="healthType != null">
+        and
             a.health_status = #{healthType}
         </if>
     </select>

health/src/main/resources/mapper_dao/JourneyAbnormalDao.xml

@@ -0,0 +1,40 @@
+<?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.ccsens.health.persist.dao.JourneyAbnormalDao">
+
+    <resultMap id="resultMap_journey_abnormal" type="com.ccsens.health.bean.vo.JourneyVo$AddAbnormalJourney">
+        <id column="id" property="id"/>
+        <result column="tripMode" property="tripMode"/>
+        <result column="carNo" property="carNo"/>
+        <result column="startTime" property="startTime"/>
+        <result column="endTime" property="endTime"/>
+        <result column="description" property="description"/>
+    </resultMap>
+
+    <select id="selectAbnormalJourney" resultMap="resultMap_journey_abnormal" parameterType="java.util.Map">
+        select
+            id as id,
+            trip_mode as tripMode,
+            car_no as carNo,
+            start_time as startTime,
+            end_time as endTime,
+            description as description
+        from
+            t_journey_abnormal
+        where
+            rec_status = 0
+        <if test="carNo == null">
+            and
+            car_no = #{carNo}
+        </if>
+        <if test="tripMode == null">
+            and
+            trip_mode = #{tripMode}
+        </if>
+        and
+            start_time &lt;= #{endTime}
+        and
+            end_time &gt;= #{startTime}
+        ORDER By h.time DESC
+    </select>
+</mapper>

health/src/main/resources/mapper_raw/JourneyAbnormalMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ccsens.health.persist.mapper.JourneyAbnormalMapper">
   <resultMap id="BaseResultMap" type="com.ccsens.health.bean.po.JourneyAbnormal">
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="trip_mode" jdbcType="VARCHAR" property="tripMode" />
+    <result column="trip_mode" jdbcType="TINYINT" property="tripMode" />
     <result column="car_no" jdbcType="VARCHAR" property="carNo" />
     <result column="start_time" jdbcType="BIGINT" property="startTime" />
     <result column="end_time" jdbcType="BIGINT" property="endTime" />
@@ -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},
       </if>
       <if test="tripMode != null">
-        #{tripMode,jdbcType=VARCHAR},
+        #{tripMode,jdbcType=TINYINT},
       </if>
       <if test="carNo != null">
         #{carNo,jdbcType=VARCHAR},
@@ -188,7 +188,7 @@
         id = #{record.id,jdbcType=BIGINT},
       </if>
       <if test="record.tripMode != null">
-        trip_mode = #{record.tripMode,jdbcType=VARCHAR},
+        trip_mode = #{record.tripMode,jdbcType=TINYINT},
       </if>
       <if test="record.carNo != null">
         car_no = #{record.carNo,jdbcType=VARCHAR},
@@ -219,7 +219,7 @@
   <update id="updateByExample" parameterType="map">
     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
     <set>
       <if test="tripMode != null">
-        trip_mode = #{tripMode,jdbcType=VARCHAR},
+        trip_mode = #{tripMode,jdbcType=TINYINT},
       </if>
       <if test="carNo != null">
         car_no = #{carNo,jdbcType=VARCHAR},
@@ -263,7 +263,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ccsens.health.bean.po.JourneyAbnormal">
     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},