修改

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/controller/MeterBaseRailwayAiweightController.java

@@ -155,4 +155,15 @@ public class MeterBaseRailwayAiweightController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseRailwayAiweight> list = meterBaseRailwayAiweightService.likeByDesc(parmas, pageNum, pageSize);
+        return success(list);
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/mapper/MeterBaseRailwayAiweightMapper.java

@@ -12,4 +12,5 @@ import java.util.List;
 public interface MeterBaseRailwayAiweightMapper extends IBaseMapper<MeterBaseRailwayAiweight, String> {
     String getNewID(@Param(value="actualFirstNo") String actualFirstNo);
     List<MeterBaseRailwayAiweight> noPage(HashMap<String, Object> parmas);
+    List<MeterBaseRailwayAiweight> likeByDesc(HashMap<String, Object> parmas);
 }

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/mapper/MeterBaseRailwayAiweightMapper.xml

@@ -575,5 +575,51 @@
       </if>
     </where>
     order by CREATE_TIME desc
-</select>
+  </select>
+
+
+
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <where>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="railwayType != null and railwayType != ''">
+        and RAILWAY_TYPE LIKE '%${railwayType}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="railwaySpeed != null">
+        and RAILWAY_SPEED = #{railwaySpeed}
+      </if>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+        and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+    </where>
+    order by CREATE_TIME desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/IMeterBaseRailwayAiweightService.java

@@ -3,6 +3,7 @@ package com.steerinfo.baseinfo.meterbaserailwayaiweight.service;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
 
 import java.util.HashMap;
 import java.util.List;
@@ -24,4 +25,5 @@ public interface IMeterBaseRailwayAiweightService extends IBaseService<MeterBase
 
     RESTfulResult checkAdd(List<MeterBaseRailwayAiweight> models);
     List<MeterBaseRailwayAiweight> noPage(HashMap<String, Object> parmas);
+    PageList<MeterBaseRailwayAiweight> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/impl/MeterBaseRailwayAiweightServiceImpl.java

@@ -6,6 +6,8 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.service.IMeterBaseRailway
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.util.StringUtils;
 import io.micrometer.core.instrument.Meter;
 import org.apache.shiro.crypto.hash.Hash;
@@ -93,4 +95,12 @@ public class MeterBaseRailwayAiweightServiceImpl extends BaseServiceImpl<MeterBa
         List<MeterBaseRailwayAiweight> rows = meterBaseRailwayAiweightMapper.noPage(parmas);
         return rows;
     }
+
+    @Override
+    public PageList<MeterBaseRailwayAiweight> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseRailwayAiweight> rows = meterBaseRailwayAiweightMapper.likeByDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2965,18 +2965,18 @@
   </select>
 
   <select id="carFirstDataDetail" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_CAR_ACTUAL_FIRST t
     where 1 = 1
     <if test="validFlag != null and validFlag != ''">
-      and  value_flag != '0'
+      and  t.value_flag != '0'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and  value_flag = #{valueFlag}
+      and  t.value_flag = #{valueFlag}
     </if>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-      and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      and  t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
-    order by create_time desc
+    order by t.create_time desc
   </select>
 
   <select id="countDayAllState" parameterType="java.util.HashMap" resultType="hashmap">

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/controller/MeterWorkCheckFirstActualController.java

@@ -0,0 +1,114 @@
+package com.steerinfo.meterwork.meterworkcheckfirstactual.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.service.IMeterWorkCheckFirstActualService;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkCheckFirstActual RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-23 04:50
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-23
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCheckFirstActual RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkcheckfirstactuals")
+public class MeterWorkCheckFirstActualController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkCheckFirstActualService meterWorkCheckFirstActualService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcheckfirstactual:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCheckFirstActual> list = meterWorkCheckFirstActualService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcheckfirstactual:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCheckFirstActual> list = meterWorkCheckFirstActualService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkCheckFirstActual对象创建")
+    @ApiImplicitParam(name = "meterWorkCheckFirstActual", value = "详细实体meterWorkCheckFirstActual", required = true, dataType = "MeterWorkCheckFirstActual")
+    //@RequiresPermissions("meterworkcheckfirstactual:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkCheckFirstActual model){
+        MeterWorkCheckFirstActual meterWorkCheckFirstActual = meterWorkCheckFirstActualService.add(model);
+        return success(meterWorkCheckFirstActual);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcheckfirstactual:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkCheckFirstActual meterWorkCheckFirstActual = meterWorkCheckFirstActualService.getById(id);
+        return success(meterWorkCheckFirstActual);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkCheckFirstActual信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkCheckFirstActual", value = "详细实体meterWorkCheckFirstActual", required = true, dataType = "MeterWorkCheckFirstActual")
+    })
+    //@RequiresPermissions("meterworkcheckfirstactual:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkCheckFirstActual model){
+        model.setId(id);
+        MeterWorkCheckFirstActual meterWorkCheckFirstActual = meterWorkCheckFirstActualService.modify(model);
+        return success(meterWorkCheckFirstActual);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcheckfirstactual:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterWorkCheckFirstActualService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="新增数据配置", notes="新增数据配置")
+    @PostMapping(value = "/addModel")
+    public RESTfulResult addModel(@RequestBody MeterWorkCheckFirstActual model){
+        MeterWorkCheckFirstActual meterWorkCheckFirstActual = meterWorkCheckFirstActualService.addModel(model);
+        return success(meterWorkCheckFirstActual);
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/mapper/MeterWorkCheckFirstActualMapper.java

@@ -0,0 +1,9 @@
+package com.steerinfo.meterwork.meterworkcheckfirstactual.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkCheckFirstActualMapper extends IBaseMapper<MeterWorkCheckFirstActual, String> {
+}

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/mapper/MeterWorkCheckFirstActualMapper.xml

@@ -0,0 +1,290 @@
+<?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.steerinfo.meterwork.meterworkcheckfirstactual.mapper.MeterWorkCheckFirstActualMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual">
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CHECK_ID" jdbcType="VARCHAR" property="checkId" />
+    <result column="CHECK_START_TIME" jdbcType="TIMESTAMP" property="checkStartTime" />
+    <result column="CHECK_END_TIME" jdbcType="TIMESTAMP" property="checkEndTime" />
+    <result column="CHECK_USED_SECONDS" jdbcType="DECIMAL" property="checkUsedSeconds" />
+    <result column="CHECK_MAN_NO" jdbcType="VARCHAR" property="checkManNo" />
+    <result column="CHECK_MAN_NAME" jdbcType="VARCHAR" property="checkManName" />
+    <result column="CHECK_RESULT" jdbcType="VARCHAR" property="checkResult" />
+  </resultMap>
+  <sql id="columns">
+    ID, CHECK_ID, CHECK_START_TIME, CHECK_END_TIME, CHECK_USED_SECONDS, CHECK_MAN_NO, 
+    CHECK_MAN_NAME, CHECK_RESULT
+  </sql>
+  <sql id="columns_alias">
+    t.ID, t.CHECK_ID, t.CHECK_START_TIME, t.CHECK_END_TIME, t.CHECK_USED_SECONDS, t.CHECK_MAN_NO, 
+    t.CHECK_MAN_NAME, t.CHECK_RESULT
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_CHECK_FIRST_ACTUAL
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_CHECK_FIRST_ACTUAL t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID = #{id}
+      </if>
+      <if test="checkId != null and checkId != ''">
+        and CHECK_ID = #{checkId}
+      </if>
+      <if test="checkStartTime != null">
+        and TO_CHAR(CHECK_START_TIME,'yyyy-MM-dd') = #{checkStartTime}
+      </if>
+      <if test="checkEndTime != null">
+        and TO_CHAR(CHECK_END_TIME,'yyyy-MM-dd') = #{checkEndTime}
+      </if>
+      <if test="checkUsedSeconds != null">
+        and CHECK_USED_SECONDS = #{checkUsedSeconds}
+      </if>
+      <if test="checkManNo != null and checkManNo != ''">
+        and CHECK_MAN_NO = #{checkManNo}
+      </if>
+      <if test="checkManName != null and checkManName != ''">
+        and CHECK_MAN_NAME = #{checkManName}
+      </if>
+      <if test="checkResult != null and checkResult != ''">
+        and CHECK_RESULT = #{checkResult}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID LIKE '%${id}%'
+      </if>
+      <if test="checkId != null and checkId != ''">
+        and CHECK_ID LIKE '%${checkId}%'
+      </if>
+      <if test="checkStartTime != null">
+        and TO_CHAR(CHECK_START_TIME,'yyyy-MM-dd') = #{checkStartTime}
+      </if>
+      <if test="checkEndTime != null">
+        and TO_CHAR(CHECK_END_TIME,'yyyy-MM-dd') = #{checkEndTime}
+      </if>
+      <if test="checkUsedSeconds != null">
+        and CHECK_USED_SECONDS = #{checkUsedSeconds}
+      </if>
+      <if test="checkManNo != null and checkManNo != ''">
+        and CHECK_MAN_NO LIKE '%${checkManNo}%'
+      </if>
+      <if test="checkManName != null and checkManName != ''">
+        and CHECK_MAN_NAME LIKE '%${checkManName}%'
+      </if>
+      <if test="checkResult != null and checkResult != ''">
+        and CHECK_RESULT LIKE '%${checkResult}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_CHECK_FIRST_ACTUAL
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_CHECK_FIRST_ACTUAL
+    where 1!=1 
+      <if test="checkId != null and checkId != ''">
+        or CHECK_ID = #{checkId}
+      </if>
+      <if test="checkStartTime != null">
+        or TO_CHAR(CHECK_START_TIME,'yyyy-MM-dd') = '#{checkStartTime}'
+      </if>
+      <if test="checkEndTime != null">
+        or TO_CHAR(CHECK_END_TIME,'yyyy-MM-dd') = '#{checkEndTime}'
+      </if>
+      <if test="checkUsedSeconds != null">
+        or CHECK_USED_SECONDS = #{checkUsedSeconds}
+      </if>
+      <if test="checkManNo != null and checkManNo != ''">
+        or CHECK_MAN_NO = #{checkManNo}
+      </if>
+      <if test="checkManName != null and checkManName != ''">
+        or CHECK_MAN_NAME = #{checkManName}
+      </if>
+      <if test="checkResult != null and checkResult != ''">
+        or CHECK_RESULT = #{checkResult}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual">
+    insert into METER_WORK_CHECK_FIRST_ACTUAL (ID, CHECK_ID, CHECK_START_TIME, 
+      CHECK_END_TIME, CHECK_USED_SECONDS, CHECK_MAN_NO, 
+      CHECK_MAN_NAME, CHECK_RESULT)
+    values (#{id,jdbcType=VARCHAR}, #{checkId,jdbcType=VARCHAR}, #{checkStartTime,jdbcType=TIMESTAMP}, 
+      #{checkEndTime,jdbcType=TIMESTAMP}, #{checkUsedSeconds,jdbcType=DECIMAL}, #{checkManNo,jdbcType=VARCHAR}, 
+      #{checkManName,jdbcType=VARCHAR}, #{checkResult,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual">
+    insert into METER_WORK_CHECK_FIRST_ACTUAL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="checkId != null">
+        CHECK_ID,
+      </if>
+      <if test="checkStartTime != null">
+        CHECK_START_TIME,
+      </if>
+      <if test="checkEndTime != null">
+        CHECK_END_TIME,
+      </if>
+      <if test="checkUsedSeconds != null">
+        CHECK_USED_SECONDS,
+      </if>
+      <if test="checkManNo != null">
+        CHECK_MAN_NO,
+      </if>
+      <if test="checkManName != null">
+        CHECK_MAN_NAME,
+      </if>
+      <if test="checkResult != null">
+        CHECK_RESULT,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="checkId != null">
+        #{checkId,jdbcType=VARCHAR},
+      </if>
+      <if test="checkStartTime != null">
+        #{checkStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkEndTime != null">
+        #{checkEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkUsedSeconds != null">
+        #{checkUsedSeconds,jdbcType=DECIMAL},
+      </if>
+      <if test="checkManNo != null">
+        #{checkManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="checkManName != null">
+        #{checkManName,jdbcType=VARCHAR},
+      </if>
+      <if test="checkResult != null">
+        #{checkResult,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual">
+    update METER_WORK_CHECK_FIRST_ACTUAL
+    set CHECK_ID = #{checkId,jdbcType=VARCHAR},
+      CHECK_START_TIME = #{checkStartTime,jdbcType=TIMESTAMP},
+      CHECK_END_TIME = #{checkEndTime,jdbcType=TIMESTAMP},
+      CHECK_USED_SECONDS = #{checkUsedSeconds,jdbcType=DECIMAL},
+      CHECK_MAN_NO = #{checkManNo,jdbcType=VARCHAR},
+      CHECK_MAN_NAME = #{checkManName,jdbcType=VARCHAR},
+      CHECK_RESULT = #{checkResult,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual">
+    update METER_WORK_CHECK_FIRST_ACTUAL
+    <set>
+      <if test="checkId != null">
+        CHECK_ID = #{checkId,jdbcType=VARCHAR},
+      </if>
+      <if test="checkStartTime != null">
+        CHECK_START_TIME = #{checkStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkEndTime != null">
+        CHECK_END_TIME = #{checkEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkUsedSeconds != null">
+        CHECK_USED_SECONDS = #{checkUsedSeconds,jdbcType=DECIMAL},
+      </if>
+      <if test="checkManNo != null">
+        CHECK_MAN_NO = #{checkManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="checkManName != null">
+        CHECK_MAN_NAME = #{checkManName,jdbcType=VARCHAR},
+      </if>
+      <if test="checkResult != null">
+        CHECK_RESULT = #{checkResult,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_CHECK_FIRST_ACTUAL 
+      (ID, 
+      CHECK_ID, CHECK_START_TIME, CHECK_END_TIME, 
+      CHECK_USED_SECONDS, CHECK_MAN_NO, 
+      CHECK_MAN_NAME, CHECK_RESULT)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.id,jdbcType=VARCHAR}, 
+      #{item.checkId,jdbcType=VARCHAR}, #{item.checkStartTime,jdbcType=TIMESTAMP}, #{item.checkEndTime,jdbcType=TIMESTAMP}, 
+      #{item.checkUsedSeconds,jdbcType=DECIMAL}, #{item.checkManNo,jdbcType=VARCHAR}, 
+      #{item.checkManName,jdbcType=VARCHAR}, #{item.checkResult,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_CHECK_FIRST_ACTUAL
+     set
+       ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.id,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.checkId,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_START_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.checkStartTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CHECK_END_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.checkEndTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CHECK_USED_SECONDS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.checkUsedSeconds,jdbcType=DECIMAL}
+       </foreach>
+       ,CHECK_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.checkManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.checkManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_RESULT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.checkResult,jdbcType=VARCHAR}
+       </foreach>
+     where ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.id,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_CHECK_FIRST_ACTUAL
+    where ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/model/MeterWorkCheckFirstActual.java

@@ -0,0 +1,144 @@
+package com.steerinfo.meterwork.meterworkcheckfirstactual.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="核查汽车衡一次或者结净数据表")
+public class MeterWorkCheckFirstActual implements IBasePO<String> {
+    /**
+     * 核查主键(ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="核查主键",required=true)
+    private String id;
+
+    /**
+     * 一次或结净主键(CHECK_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="一次或结净主键",required=true)
+    private String checkId;
+
+    /**
+     * 核查开始时间(CHECK_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="核查开始时间",required=false)
+    private Date checkStartTime;
+
+    /**
+     * 核查结束时间(CHECK_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="核查结束时间",required=false)
+    private Date checkEndTime;
+
+    /**
+     * 核查用时(CHECK_USED_SECONDS,DECIMAL,38)
+     */
+    @ApiModelProperty(value="核查用时",required=false)
+    private BigDecimal checkUsedSeconds;
+
+    /**
+     * 核查人编号(CHECK_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="核查人编号",required=false)
+    private String checkManNo;
+
+    /**
+     * 核查人(CHECK_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="核查人",required=false)
+    private String checkManName;
+
+    /**
+     * 核查结果(CHECK_RESULT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="核查结果",required=false)
+    private String checkResult;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getCheckId() {
+        return checkId;
+    }
+
+    public void setCheckId(String checkId) {
+        this.checkId = checkId == null ? null : checkId.trim();
+    }
+
+    public Date getCheckStartTime() {
+        return checkStartTime;
+    }
+
+    public void setCheckStartTime(Date checkStartTime) {
+        this.checkStartTime = checkStartTime;
+    }
+
+    public Date getCheckEndTime() {
+        return checkEndTime;
+    }
+
+    public void setCheckEndTime(Date checkEndTime) {
+        this.checkEndTime = checkEndTime;
+    }
+
+    public BigDecimal getCheckUsedSeconds() {
+        return checkUsedSeconds;
+    }
+
+    public void setCheckUsedSeconds(BigDecimal checkUsedSeconds) {
+        this.checkUsedSeconds = checkUsedSeconds;
+    }
+
+    public String getCheckManNo() {
+        return checkManNo;
+    }
+
+    public void setCheckManNo(String checkManNo) {
+        this.checkManNo = checkManNo == null ? null : checkManNo.trim();
+    }
+
+    public String getCheckManName() {
+        return checkManName;
+    }
+
+    public void setCheckManName(String checkManName) {
+        this.checkManName = checkManName == null ? null : checkManName.trim();
+    }
+
+    public String getCheckResult() {
+        return checkResult;
+    }
+
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult == null ? null : checkResult.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", checkId=").append(checkId);
+        sb.append(", checkStartTime=").append(checkStartTime);
+        sb.append(", checkEndTime=").append(checkEndTime);
+        sb.append(", checkUsedSeconds=").append(checkUsedSeconds);
+        sb.append(", checkManNo=").append(checkManNo);
+        sb.append(", checkManName=").append(checkManName);
+        sb.append(", checkResult=").append(checkResult);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/service/IMeterWorkCheckFirstActualService.java

@@ -0,0 +1,22 @@
+package com.steerinfo.meterwork.meterworkcheckfirstactual.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+
+/**
+ * MeterWorkCheckFirstActual服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-23 04:50
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-23
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCheckFirstActual服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkCheckFirstActualService extends IBaseService<MeterWorkCheckFirstActual, String>{
+    MeterWorkCheckFirstActual addModel(MeterWorkCheckFirstActual model);
+}

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/service/impl/MeterWorkCheckFirstActualServiceImpl.java

@@ -0,0 +1,62 @@
+package com.steerinfo.meterwork.meterworkcheckfirstactual.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.mapper.MeterWorkCheckFirstActualMapper;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.service.IMeterWorkCheckFirstActualService;
+import com.steerinfo.util.PublicMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * MeterWorkCheckFirstActual服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-23 04:50
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-23
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCheckFirstActual服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkCheckFirstActualService")
+public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterWorkCheckFirstActual, String> implements IMeterWorkCheckFirstActualService {
+
+    @Autowired(required = false)
+    private MeterWorkCheckFirstActualMapper meterWorkCheckFirstActualMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkCheckFirstActual, String> getMapper() {
+        return meterWorkCheckFirstActualMapper;
+    }
+
+    @Override
+    public MeterWorkCheckFirstActual addModel(MeterWorkCheckFirstActual model) {
+        model.setId(PublicMethod.IdCreate(3));
+        long startTime = model.getCheckStartTime().getTime();
+        long endTime = model.getCheckEndTime().getTime();
+        model.setCheckUsedSeconds(new BigDecimal(Math.abs((startTime - endTime)/1000)));
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setCheckManNo(userId);
+        model.setCheckManName(userName);
+        meterWorkCheckFirstActualMapper.insert(model);
+        return model;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -3,13 +3,15 @@
 <mapper namespace="com.steerinfo.meterwork.meterworkdatacount.mapper.MeterWorkDataCountMapper">
     <select id="countFirstAndActual" parameterType="java.util.HashMap" resultType="hashmap">
         select
-        (select count(*) from meter_work_car_actual_first t where t.value_flag !='0'
+        (select count(*) from meter_work_car_actual_first t
+        where t.value_flag !='0'
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and  t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>) as count_First_Valid,
-        (select count(*) from meter_work_car_actual_first t where t.value_flag ='1'
+        (select count(*) from meter_work_car_actual_first t
+        where t.value_flag ='1'
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and  t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>) as count_First_Effective_Unclean,
         (select count(*) from meter_work_car_actual t where t.value_flag != '0'
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -255,7 +255,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
 //                        AiModel.setMeterWeight(new BigDecimal(model.getAiWeight()));
 //                        AiModel.setRailwayType(model.getRailwayModelName());
 //                        AiModel.setRailwayTypeNo("001019002");
-//                        AiModel.setRailwayTypeNo("动态轨道衡");
+//                        AiModel.setRailwayTypeName("动态轨道衡");
 //                        AiModel.setValueFlag("1");
 //                        AiModel.setCreateManNo("systemAdd");
 //                        AiModel.setCreateManName("systemAdd");

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/controller/MeterWorkScheduledHelpController.java

@@ -88,6 +88,24 @@ public class MeterWorkScheduledHelpController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiOperation(value="各种报警信息汇总统计-获取列表", notes="不分页模糊查询")
+    //@RequiresPermissions("meterworkscheduledhelp:view")
+    @PostMapping(value = "/helpContentSummary")
+    public RESTfulResult helpContentSummary(@RequestBody(required = false) HashMap parmas){
+        List<HashMap> list = meterWorkScheduledHelpService.helpContentSummary(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="各种报警信息明细-获取列表", notes="不分页模糊查询")
+    //@RequiresPermissions("meterworkscheduledhelp:view")
+    @PostMapping(value = "/helpContentDetail")
+    public RESTfulResult helpContentDetail(@RequestBody HashMap parmas){
+        Integer pageNum = Integer.parseInt(parmas.get("pageNum").toString());
+        Integer pageSize = Integer.parseInt(parmas.get("pageSize").toString());
+        PageList<MeterWorkScheduledHelp> list = meterWorkScheduledHelpService.helpContentDetail(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
 
     @ApiOperation(value="创建", notes="根据MeterWorkScheduledHelp对象创建")
     @ApiImplicitParam(name = "meterWorkScheduledHelp", value = "详细实体meterWorkScheduledHelp", required = true, dataType = "MeterWorkScheduledHelp")

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.java

@@ -19,4 +19,9 @@ public interface MeterWorkScheduledHelpMapper extends IBaseMapper<MeterWorkSched
     //根据时间查询所有秤点的报警总数、报警未处理、报警已处理
     List<MeterWorkScheduledHelp> countAllState(Map<String, Object> params);
     List<MeterWorkScheduledHelp> allStateView(Map<String, Object> params);
+
+    //统计报警信息所对应的秤点
+    List<MeterWorkScheduledHelp> helpContentSummarySpot(Map<String, Object> params);
+    //查询报警信息
+    List<MeterWorkScheduledHelp> helpContentSummary(Map<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.xml

@@ -458,7 +458,58 @@
 
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
-    <include refid="whereLike"/>
+    <where>
+      <if test="helpId != null and helpId != ''">
+        and HELP_ID LIKE '%${helpId}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="helpContent != null and helpContent != ''">
+        and HELP_CONTENT LIKE '%${helpContent}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="endTime != null">
+        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
+      </if>
+      <if test="createNo != null and createNo != ''">
+        and CREATE_NO LIKE '%${createNo}%'
+      </if>
+      <if test="createName != null and createName != ''">
+        and CREATE_NAME LIKE '%${createName}%'
+      </if>
+      <if test="result != null and result != ''">
+        and RESULT LIKE '%${result}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM LIKE '%${measureTaskNum}%'
+      </if>
+      <if test="warmType != null and warmType != ''">
+        and WARM_TYPE LIKE '%${warmType}%'
+      </if>
+      <if test="warmTypeName != null and warmTypeName != ''">
+        and WARM_TYPE_NAME LIKE '%${warmTypeName}%'
+      </if>
+      <if test="startTime01 != null and startTime01 != ''">
+        and create_time >= to_date(#{startTime01}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="endTime01 != null and endTime01 != ''">
+        and create_time &lt;= to_date(#{endTime01}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      and warm_type in ('1', '2', '3')
+      and warm_type not in ('8')
+    </where>
     order by create_time desc
   </select>
 
@@ -565,4 +616,89 @@
       and  base_spot_name like '%${baseSpotName}%'
     </if>
   </select>
+
+  <select id="helpContentSummarySpot" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select base_spot_no, base_spot_name
+    from meter_work_scheduled_help
+    where 1 = 1
+    and warm_type in ('1', '2', '3')
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+      and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNoStr != null and baseSpotNoStr != ''">
+      and base_spot_no in
+      <foreach collection="spotStr" item="item" open="(" close=")" separator=",">
+        #{item}
+      </foreach>
+    </if>
+    group by base_spot_no, base_spot_name
+  </select>
+
+  <select id="helpContentSummary" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+    and warm_type in ('1', '2', '3')
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+      and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNoStr != null and baseSpotNoStr != ''">
+      and base_spot_no in
+      <foreach collection="spotStr" item="item" open="(" close=")" separator=",">
+        #{item}
+      </foreach>
+    </if>
+    <if test="helpContent != null and helpContent != ''">
+      and  help_content like '%${helpContent}%'
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  base_spot_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  base_spot_name like '%${baseSpotName}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag like '%${valueFlag}%'
+    </if>
+    <if test="contentType != null and contentType != ''">
+      <if test="contentType == 1">
+        and help_content like '%疑似跟车%'
+      </if>
+      <if test="contentType == 2">
+        and help_content like '%双摄像头只有一个识别，请核查车号%'
+      </if>
+      <if test="contentType == 3">
+        and help_content like '%扫码过秤%'
+      </if>
+      <if test="contentType == 4">
+        and help_content like '%使用委托没有匹配一次记录，自动修改为未使用状态%'
+      </if>
+      <if test="contentType == 5">
+        and ( ( help_content like '%存在%'and help_content like '%存在%' ) or help_content like '%存在%')
+      </if>
+      <if test="contentType == 6">
+        and help_content like '%多个完全相同委托自动匹配最新委托%'
+      </if>
+      <if test="contentType == 7">
+        and help_content like '%毛重%'
+      </if>
+      <if test="contentType == 8">
+        and help_content like '%连续保存皮重%'
+      </if>
+      <if test="contentType == 9">
+        and help_content like '%仪表抓图失败，请重启该秤点智能终端%'
+      </if>
+      <if test="contentType == 10">
+        and help_content like '%期限皮过期%'
+      </if>
+      <if test="contentType == 11">
+        and help_content like '%留存期限皮成功%'
+      </if>
+      <if test="contentType == 12">
+        and help_content like '%大厅%'
+      </if>
+    </if>
+    order by create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/IMeterWorkScheduledHelpService.java

@@ -5,6 +5,8 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,4 +29,9 @@ public interface IMeterWorkScheduledHelpService extends IBaseService<MeterWorkSc
     PageList<MeterWorkScheduledHelp> likeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
     PageList<MeterWorkScheduledHelp> HelpMsgByDesc(Map<String, Object> var1, Integer var2, Integer var3);
     PageList<MeterWorkScheduledHelp> allStateView(Map<String, Object> params, Integer pageNum, Integer pageSize);
+
+    //汽车衡报警信息汇总统计
+    List<HashMap> helpContentSummary(HashMap<String, Object> params);
+    //汽车衡报警信息明细
+    PageList<MeterWorkScheduledHelp> helpContentDetail(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/impl/MeterWorkScheduledHelpServiceImpl.java

@@ -17,10 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * MeterWorkScheduledHelp服务实现：
@@ -176,4 +173,126 @@ public class MeterWorkScheduledHelpServiceImpl extends BaseServiceImpl<MeterWork
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    public List<HashMap> helpContentSummary(HashMap<String, Object> params) {
+        if(params.get("baseSpotNoStr") != null && !params.get("baseSpotNoStr").equals("")) {
+            String[] spotStr = params.get("baseSpotNoStr").toString().split(",");
+            params.put("spotStr", spotStr);
+        }
+        //统计报警信息秤点信息
+        List<MeterWorkScheduledHelp> spotModels = meterWorkScheduledHelpMapper.helpContentSummarySpot(params);
+        //根据秤点信息查询报警信息
+        List<MeterWorkScheduledHelp> scheduledHelps = meterWorkScheduledHelpMapper.helpContentSummary(params);
+        List<HashMap> mapList = new ArrayList<>();
+        if(spotModels.size() >= 1) {
+            for(MeterWorkScheduledHelp spotModel: spotModels){
+                //疑似跟车
+                long countFollowCar = 0L;
+                //车号未识别
+                long countNotIdentify = 0L;
+                //车号识别不一致
+//                long countIdentifyError = 0L;
+                //重置委托状态
+                long countResetScaleFlag = 0L;
+                //扫码计量
+                long countScanCode = 0L;
+                //无委托结净数
+                long countNotMatchScaleClean = 0L;
+                //匹配最新委托结净数
+                long countMatchScaleClean = 0L;
+                //存在未结净毛重（一次毛重）
+                long countFirstGross = 0L;
+                //连续保存皮重（一次皮重）
+                long countFirstTare = 0L;
+                //无仪表盘抓拍图片
+                long countInstrument = 0L;
+                //期限皮过期，请留存期限皮
+                long countTermDataNo = 0L;
+                //留存期限皮成功
+                long countTermDataYes = 0L;
+                //联系大厅
+                long countContactLobby = 0L;
+                //已处理
+                long countProcessed = 0L;
+                //未处理
+                long countUnprocessed = 0L;
+                if(scheduledHelps.size() >= 1) {
+                    countFollowCar = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("疑似跟车")).count();
+                    countNotIdentify = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && ( item.getHelpContent().contains("双摄像头只有一个识别，请核查车号"))).count();
+//                    countIdentifyError = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+//                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())).count();
+                    countScanCode = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("扫码过秤")).count();
+                    countResetScaleFlag = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("正使用委托没有匹配一次记录，自动修改为未使用状态")).count();
+                    countNotMatchScaleClean = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && (    (item.getHelpContent().contains("存在") && item.getHelpContent().contains("个委托"))
+                                    || item.getHelpContent().contains("无委托结净")  )).count();
+                    countMatchScaleClean = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("多个完全相同委托自动匹配最新委托")).count();
+                    countFirstGross = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("毛重")).count();
+                    countFirstTare = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("连续保存皮重")).count();
+                    countInstrument = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("仪表抓图失败，请重启该秤点智能终端")).count();
+                    countTermDataNo = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("期限皮过期")).count();
+                    countTermDataYes = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("留存期限皮成功")).count();
+                    countContactLobby = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getHelpContent().contains("大厅")).count();
+                    countProcessed = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getValueFlag().equals("1")).count();
+                    countUnprocessed = scheduledHelps.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getValueFlag().equals("0")).count();
+                }
+                HashMap map = new HashMap<>();
+                map.put("baseSpotNo", spotModel.getBaseSpotNo());
+                map.put("baseSpotName", spotModel.getBaseSpotName());
+                map.put("countFollowCar", countFollowCar);
+                map.put("countNotIdentify", countNotIdentify);
+//                map.put("countIdentifyError", countIdentifyError);
+                map.put("countResetScaleFlag", countResetScaleFlag);
+                map.put("countScanCode", countScanCode);
+                map.put("countNotMatchScaleClean", countNotMatchScaleClean);
+                map.put("countMatchScaleClean", countMatchScaleClean);
+                map.put("countFirstGross", countFirstGross);
+                map.put("countFirstTare", countFirstTare);
+                map.put("countInstrument", countInstrument);
+                map.put("countTermDataNo", countTermDataNo);
+                map.put("countTermDataYes", countTermDataYes);
+                map.put("countContactLobby", countContactLobby);
+                map.put("countProcessed", countProcessed);
+                map.put("countUnprocessed", countUnprocessed);
+                mapList.add(map);
+            }
+        }
+        return mapList;
+    }
+
+    @Override
+    public PageList<MeterWorkScheduledHelp> helpContentDetail(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkScheduledHelp> rows = meterWorkScheduledHelpMapper.helpContentSummary(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }