后端修改

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.java

@@ -17,4 +17,5 @@ public interface MeterBaseSystemMessageMapper extends IBaseMapper<MeterBaseSyste
 
     List<MeterBaseSystemMessage> likeDesc(HashMap params);
     List<MeterBaseSystemMessage> getNews();
+    List<MeterBaseSystemMessage> listDesc(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.xml

@@ -534,4 +534,13 @@
     where valid_flag = 1
     order by create_time desc
   </select>
+
+  <select id="listDesc" resultType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+        and SYSTEM_MESSAGE_NO in
+        <foreach collection="newList" item="item" separator="," open="(" close=")">
+          #{item}
+        </foreach>
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasesystemnews/controller/MeterBaseSystemNewsController.java

@@ -0,0 +1,154 @@
+package com.steerinfo.baseinfo.meterbasesystemnews.controller;
+
+import com.steerinfo.baseinfo.meterbasesystemnews.mapper.MeterBaseSystemNewsMapper;
+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.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews;
+import com.steerinfo.baseinfo.meterbasesystemnews.service.IMeterBaseSystemNewsService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseSystemNews RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-07-25 09:45
+ * 类描述
+ * 修订历史：
+ * 日期：2022-07-25
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSystemNews RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasesystemnewss")
+public class MeterBaseSystemNewsController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseSystemNewsService meterBaseSystemNewsService;
+
+    @Resource
+    MeterBaseSystemNewsMapper meterBaseSystemNewsMapper;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasesystemnews:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSystemNews> list = meterBaseSystemNewsService.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("meterbasesystemnews:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSystemNews> list = meterBaseSystemNewsService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseSystemNews对象创建")
+    @ApiImplicitParam(name = "meterBaseSystemNews", value = "详细实体meterBaseSystemNews", required = true, dataType = "MeterBaseSystemNews")
+    //@RequiresPermissions("meterbasesystemnews:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseSystemNews model){
+        MeterBaseSystemNews meterBaseSystemNews = meterBaseSystemNewsService.add(model);
+        return success(meterBaseSystemNews);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasesystemnews:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseSystemNews meterBaseSystemNews = meterBaseSystemNewsService.getById(id);
+        return success(meterBaseSystemNews);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseSystemNews信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseSystemNews", value = "详细实体meterBaseSystemNews", required = true, dataType = "MeterBaseSystemNews")
+    })
+    //@RequiresPermissions("meterbasesystemnews:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseSystemNews model){
+        model.setId(id);
+        MeterBaseSystemNews meterBaseSystemNews = meterBaseSystemNewsService.modify(model);
+        return success(meterBaseSystemNews);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasesystemnews: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);
+			  meterBaseSystemNewsService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="App登录自动生成车辆通告信息", notes="根据carNo获取MeterBaseSystemMessage生成MeterBaseSystemNews")
+    @PostMapping(value = "/addNews")
+    public RESTfulResult addNews(@RequestBody HashMap params) {
+        RESTfulResult rm = meterBaseSystemNewsService.addNews(params);
+        return rm;
+    }
+
+    @ApiOperation(value="倒序获取车辆通告信息", notes="根据carNo获取MeterBaseSystemNews")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasesystemnews:view")
+    @GetMapping(value = "/newsListDesc/")
+    public RESTfulResult newsListDesc(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSystemNews> list = meterBaseSystemNewsService.newsListDesc(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="系统消息已读", notes="系统消息已读")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "parma", value = "HashMap", required = true, dataType = "HashMap")
+    })
+    @PutMapping(value = "/updateIsRead", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updateIsRead(@RequestBody HashMap parma){
+        try {
+            if((parma.get("carNo") == null || StringUtils.isEmpty(parma.get("carNo").toString())) &&
+                    (parma.get("systemMessageNo") == null || StringUtils.isEmpty(parma.get("systemMessageNo").toString()))) {
+                return  failed(null, "车号和信息编号不能为空");
+            }
+            meterBaseSystemNewsMapper.updateIsRead(parma.get("carNo").toString() + parma.get("systemMessageNo").toString());
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return  failed(null,"操作异常，请确认");
+        }
+        return success();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemnews/mapper/MeterBaseSystemNewsMapper.java

@@ -0,0 +1,15 @@
+package com.steerinfo.baseinfo.meterbasesystemnews.mapper;
+
+import com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseSystemNewsMapper extends IBaseMapper<MeterBaseSystemNews, String> {
+    List<MeterBaseSystemNews> distinctMessageNo(HashMap params);
+    void updateIsRead(String carNewsNo);
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemnews/mapper/MeterBaseSystemNewsMapper.xml

@@ -0,0 +1,199 @@
+<?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.baseinfo.meterbasesystemnews.mapper.MeterBaseSystemNewsMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews">
+    <id column="CAR_NEWS_NO" jdbcType="VARCHAR" property="carNewsNo" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="SYSTEM_MESSAGE_NO" jdbcType="VARCHAR" property="systemMessageNo" />
+    <result column="IS_READ" jdbcType="VARCHAR" property="isRead" />
+  </resultMap>
+  <sql id="columns">
+    CAR_NEWS_NO, CAR_NO, SYSTEM_MESSAGE_NO, IS_READ
+  </sql>
+  <sql id="columns_alias">
+    t.CAR_NEWS_NO, t.CAR_NO, t.SYSTEM_MESSAGE_NO, t.IS_READ
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_SYSTEM_NEWS
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_SYSTEM_NEWS t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="carNewsNo != null and carNewsNo != ''">
+        and CAR_NEWS_NO = #{carNewsNo}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="systemMessageNo != null and systemMessageNo != ''">
+        and SYSTEM_MESSAGE_NO = #{systemMessageNo}
+      </if>
+      <if test="isRead != null and isRead != ''">
+        and IS_READ = #{isRead}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="carNewsNo != null and carNewsNo != ''">
+        and CAR_NEWS_NO LIKE '%${carNewsNo}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="systemMessageNo != null and systemMessageNo != ''">
+        and SYSTEM_MESSAGE_NO LIKE '%${systemMessageNo}%'
+      </if>
+      <if test="isRead != null and isRead != ''">
+        and IS_READ LIKE '%${isRead}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_SYSTEM_NEWS
+    where CAR_NEWS_NO = #{carNewsNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_SYSTEM_NEWS
+    where 1!=1 
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="systemMessageNo != null and systemMessageNo != ''">
+        or SYSTEM_MESSAGE_NO = #{systemMessageNo}
+      </if>
+      <if test="isRead != null and isRead != ''">
+        or IS_READ = #{isRead}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews">
+    insert into METER_BASE_SYSTEM_NEWS (CAR_NEWS_NO, CAR_NO, SYSTEM_MESSAGE_NO, 
+      IS_READ)
+    values (#{carNewsNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{systemMessageNo,jdbcType=VARCHAR}, 
+      #{isRead,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews">
+    insert into METER_BASE_SYSTEM_NEWS
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="carNewsNo != null">
+        CAR_NEWS_NO,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="systemMessageNo != null">
+        SYSTEM_MESSAGE_NO,
+      </if>
+      <if test="isRead != null">
+        IS_READ,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="carNewsNo != null">
+        #{carNewsNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="systemMessageNo != null">
+        #{systemMessageNo,jdbcType=VARCHAR},
+      </if>
+      <if test="isRead != null">
+        #{isRead,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews">
+    update METER_BASE_SYSTEM_NEWS
+    set CAR_NO = #{carNo,jdbcType=VARCHAR},
+      SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR},
+      IS_READ = #{isRead,jdbcType=VARCHAR}
+    where CAR_NEWS_NO = #{carNewsNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews">
+    update METER_BASE_SYSTEM_NEWS
+    <set>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="systemMessageNo != null">
+        SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR},
+      </if>
+      <if test="isRead != null">
+        IS_READ = #{isRead,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CAR_NEWS_NO = #{carNewsNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CAR_NEWS_NO = #{carNewsNo,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_BASE_SYSTEM_NEWS 
+      (CAR_NEWS_NO, 
+      CAR_NO, SYSTEM_MESSAGE_NO, IS_READ
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.carNewsNo,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.systemMessageNo,jdbcType=VARCHAR}, #{item.isRead,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_SYSTEM_NEWS
+     set
+       CAR_NEWS_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NEWS_NO" close="end">
+          when #{item.carNewsNo,jdbcType=VARCHAR} then #{item.carNewsNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NEWS_NO" close="end">
+          when #{item.carNewsNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SYSTEM_MESSAGE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NEWS_NO" close="end">
+          when #{item.carNewsNo,jdbcType=VARCHAR} then #{item.systemMessageNo,jdbcType=VARCHAR}
+       </foreach>
+       ,IS_READ=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NEWS_NO" close="end">
+          when #{item.carNewsNo,jdbcType=VARCHAR} then #{item.isRead,jdbcType=VARCHAR}
+       </foreach>
+     where CAR_NEWS_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.carNewsNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_SYSTEM_NEWS
+    where CAR_NEWS_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="distinctMessageNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select distinct SYSTEM_MESSAGE_NO
+        from METER_BASE_SYSTEM_NEWS
+    where 1 = 1
+        <if test="carNo != null and carNo !=''">
+          and car_no = #{carNo}
+        </if>
+  </select>
+
+  <update id="updateIsRead" parameterType="java.lang.String">
+    update METER_BASE_SYSTEM_NEWS set IS_READ = '1' where car_news_no = #{systemMessageNo}
+  </update>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasesystemnews/model/MeterBaseSystemNews.java

@@ -0,0 +1,91 @@
+package com.steerinfo.baseinfo.meterbasesystemnews.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value="APP车辆司机通告")
+public class MeterBaseSystemNews implements IBasePO<String> {
+    /**
+     * 车辆消息编号(CAR_NEWS_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="车辆消息编号",required=true)
+    private String carNewsNo;
+
+    /**
+     * 车辆(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车辆",required=false)
+    private String carNo;
+
+    /**
+     * 系统消息编号(SYSTEM_MESSAGE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="系统消息编号",required=false)
+    private String systemMessageNo;
+
+    /**
+     * 是否已读（0:未读，1：已读）(IS_READ,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否已读（0:未读，1：已读）",required=false)
+    private String isRead;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.carNewsNo;
+    }
+
+    @Override
+    public void setId(String carNewsNo) {
+        this.carNewsNo = carNewsNo == null ? null : carNewsNo.trim();
+    }
+
+    public String getCarNewsNo() {
+        return carNewsNo;
+    }
+
+    public void setCarNewsNo(String carNewsNo) {
+        this.carNewsNo = carNewsNo == null ? null : carNewsNo.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public String getSystemMessageNo() {
+        return systemMessageNo;
+    }
+
+    public void setSystemMessageNo(String systemMessageNo) {
+        this.systemMessageNo = systemMessageNo == null ? null : systemMessageNo.trim();
+    }
+
+    public String getIsRead() {
+        return isRead;
+    }
+
+    public void setIsRead(String isRead) {
+        this.isRead = isRead == null ? null : isRead.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", carNewsNo=").append(carNewsNo);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", systemMessageNo=").append(systemMessageNo);
+        sb.append(", isRead=").append(isRead);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemnews/service/IMeterBaseSystemNewsService.java

@@ -0,0 +1,29 @@
+package com.steerinfo.baseinfo.meterbasesystemnews.service;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews;
+import com.steerinfo.framework.service.pagehelper.PageList;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+
+/**
+ * MeterBaseSystemNews服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-07-25 09:45
+ * 类描述
+ * 修订历史：
+ * 日期：2022-07-25
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSystemNews服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseSystemNewsService extends IBaseService<MeterBaseSystemNews, String>{
+    RESTfulResult addNews(HashMap<String, Object> params);
+    PageList<MeterBaseSystemNews> newsListDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemnews/service/impl/MeterBaseSystemNewsServiceImpl.java

@@ -0,0 +1,114 @@
+package com.steerinfo.baseinfo.meterbasesystemnews.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.steerinfo.baseinfo.meterbasesystemmessage.mapper.MeterBaseSystemMessageMapper;
+import com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterbasesystemnews.model.MeterBaseSystemNews;
+import com.steerinfo.baseinfo.meterbasesystemnews.mapper.MeterBaseSystemNewsMapper;
+import com.steerinfo.baseinfo.meterbasesystemnews.service.IMeterBaseSystemNewsService;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkhookactfirst.model.MeterWorkHookActFirst;
+import com.steerinfo.util.StringUtils;
+import io.micrometer.core.instrument.Meter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * MeterBaseSystemNews服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-07-25 09:45
+ * 类描述
+ * 修订历史：
+ * 日期：2022-07-25
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSystemNews服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseSystemNewsService")
+public class MeterBaseSystemNewsServiceImpl extends BaseServiceImpl<MeterBaseSystemNews, String> implements IMeterBaseSystemNewsService {
+
+    @Resource
+    private MeterBaseSystemNewsMapper meterBaseSystemNewsMapper;
+
+    @Resource
+    private MeterBaseSystemMessageMapper meterBaseSystemMessageMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseSystemNews, String> getMapper() {
+        return meterBaseSystemNewsMapper;
+    }
+
+    @Override
+    public RESTfulResult addNews(HashMap<String, Object> params) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            String carNo = params.get("carNo") == null ? "" : params.get("carNo").toString();
+            Assert.isTrue(StringUtils.isNotEmpty(carNo), "车号为空,不允许生成车辆通告信息");
+            int count = 0;
+            List<MeterBaseSystemMessage> messageList = meterBaseSystemMessageMapper.selectByParameters(null);
+            if(messageList.size() >= 1) {
+                for(MeterBaseSystemMessage messageModel: messageList) {
+                    HashMap<String, Object> obj = new HashMap<>();
+                    obj.put("carNo", carNo);
+                    obj.put("systemMessageNo", messageModel.getSystemMessageNo());
+                    List<MeterBaseSystemNews> newsList = meterBaseSystemNewsMapper.selectByParameters(obj);
+                    if(newsList.size() < 1) {
+                        MeterBaseSystemNews model = new MeterBaseSystemNews();
+                        model.setCarNewsNo(carNo + messageModel.getSystemMessageNo());
+                        model.setCarNo(carNo);
+                        model.setSystemMessageNo(messageModel.getSystemMessageNo());
+                        model.setIsRead("0");
+                        meterBaseSystemNewsMapper.insertSelective(model);
+                        count ++;
+                    }
+                }
+                rm.setSucceed();
+                rm.setCode("200");
+                rm.setData(null);
+                rm.setMessage(carNo + "自动生成了" + count + "条车辆通告信息");
+            }else {
+                rm.setData(null);
+                rm.setCode("500");
+                rm.setMessage("系统通告没有通告，不能生成车辆通告信息");
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public PageList<MeterBaseSystemNews> newsListDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+
+        PageHelper.startPage(pageNum, pageSize);
+        String carNo = params.get("carNo") == null ? "" : params.get("carNo").toString();
+        Assert.isTrue(StringUtils.isNotEmpty(carNo), "车号为空,不允许生成车辆通告信息");
+        HashMap<String, Object> obj = new HashMap<>();
+        obj.put("carNo", carNo);
+        List<MeterBaseSystemNews> modelList = meterBaseSystemNewsMapper.distinctMessageNo(obj);
+        List<String> newsList = modelList.stream().map(MeterBaseSystemNews::getSystemMessageNo).collect(Collectors.toList());
+        if(newsList.size() < 1) {
+            newsList.add("");
+        }
+        HashMap<String, Object> objMap = new HashMap<>();
+        objMap.put("newList", newsList);
+        List<MeterBaseSystemMessage> messagesList = meterBaseSystemMessageMapper.listDesc(objMap);
+        PageList pageInfo = new PageList(messagesList);
+        return pageInfo;
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -410,9 +410,14 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
                 Date endTime = sdf.parse(sdf.format(new Date()));
                 long from = startTime.getTime();
                 long to = endTime.getTime();
-                int day = (int)(from - to)/(60*60*24*100);
+                int day = (int)(from - to)/(60*60*24*1000);
                 int hour = (int)(from - to)/(60*60*1000);
-                int minutes = (int)(from - to)/(60*1000);
+                int minutes = 0;
+                if(hour>=1) {
+                    minutes = (int)(from - to)/(60*1000) - (hour*60);
+                }else {
+                    minutes = (int)(from - to)/(60*1000);
+                }
                 if(startTime.compareTo(endTime) > 0) {
                     map.put("flag", "1");
                 }else {

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/controller/MeterBaseUnitInfoController.java

@@ -133,4 +133,11 @@ public class MeterBaseUnitInfoController extends BaseRESTfulController {
         }
         return success(null,"删除成功");
     }
+
+    @ApiOperation(value="获取不分页列表", notes="不分页模糊查询")
+    @PostMapping(value = "/getUnitInfo")
+    public RESTfulResult getUnitInfo(@RequestBody MeterBaseUnitInfo parmas){
+        List<MeterBaseUnitInfo> list = meterBaseUnitInfoService.getUnitInfo(parmas);
+        return success(list);
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/mapper/MeterBaseUnitInfoMapper.java

@@ -11,4 +11,5 @@ import java.util.Map;
 public interface MeterBaseUnitInfoMapper extends IBaseMapper<MeterBaseUnitInfo, String> {
     String getNewID(@org.apache.ibatis.annotations.Param(value="afl")String afl);
     List<MeterBaseUnitInfo> queryBynoPage(Map<String, Object> map);
+    List<MeterBaseUnitInfo> getUnitInfo(MeterBaseUnitInfo map);
 }

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/mapper/MeterBaseUnitInfoMapper.xml

@@ -582,4 +582,10 @@
     <include refid="whereLike"/>
     order by create_time desc
   </select>
+
+  <select id="getUnitInfo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from METER_BASE_UNIT_INFO where (CAR_NO = #{carNo,jdbcType=VARCHAR} or CAR_NO is NULL)
+    and ((FORWARDING_UNIT_NO  = #{forwardingUnitNo,jdbcType=VARCHAR} and RECEIVING_UNIT_NO = #{receivingUnitNo,jdbcType=VARCHAR}) or (FORWARDING_UNIT_NO is NULL and RECEIVING_UNIT_NO is NULL))
+    and (MATTER_NO = #{matterNo,jdbcType=VARCHAR} or MATTER_NO is NULL)
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/service/IMeterBaseUnitInfoService.java

@@ -23,4 +23,5 @@ import java.util.Map;
 public interface IMeterBaseUnitInfoService extends IBaseService<MeterBaseUnitInfo, String>{
     List<MeterBaseUnitInfo> queryBynoPage(Map<String, Object> parmas);
     RESTfulResult addModel(MeterBaseUnitInfo model);
+    List<MeterBaseUnitInfo> getUnitInfo(MeterBaseUnitInfo model);
 }

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/service/impl/MeterBaseUnitInfoServiceImpl.java

@@ -61,7 +61,7 @@ public class MeterBaseUnitInfoServiceImpl extends BaseServiceImpl<MeterBaseUnitI
             map.put("receivingUnitNo", model.getReceivingUnitNo());
             map.put("matterNo", model.getMatterNo());
             List<MeterBaseUnitInfo> models = meterBaseUnitInfoMapper.selectByParameters(map);
-            if(models.size() >= 1) {
+            if(models.size() == 1) {
                 rm.setMessage("配置的收货单位、发货单位、物料、车号存在相同的数据信息，请确认！！！");
                 return rm;
             }
@@ -86,5 +86,18 @@ public class MeterBaseUnitInfoServiceImpl extends BaseServiceImpl<MeterBaseUnitI
         }
     }
 
-
+    @Override
+    public List<MeterBaseUnitInfo> getUnitInfo(MeterBaseUnitInfo model) {
+        boolean isFlag = false;
+        List<MeterBaseUnitInfo> list = meterBaseUnitInfoMapper.getUnitInfo(model);
+        for (MeterBaseUnitInfo models:list) {
+            if(models.getAllowedTareWeight().equals("0")){
+                isFlag = true;
+            }
+        }
+        if(isFlag){
+            list = null;
+        }
+        return list;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -4111,6 +4111,9 @@
         <if test="senderRemark != null and senderRemark != ''">
           and sender_remark LIKE '%${senderRemark}%'
         </if>
+        <if test="carNo != null and carNo != ''">
+          and car_no LIKE '%${carNo}%'
+        </if>
     group by matter_no, matter_name, forwarding_unit_no, forwarding_unit_name, receiving_uint_no, receiving_uint_name
     union
         (
@@ -4141,6 +4144,9 @@
             <if test="senderRemark != null and senderRemark != ''">
               and fs_senderRemark LIKE '%${senderRemark}%'
             </if>
+            <if test="carNo != null and carNo != ''">
+              and FS_CARNO LIKE '%${carNo}%'
+            </if>
         group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
         )
     )

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -1034,17 +1034,18 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
     public RESTfulResult distinctCarNo(@RequestParam HashMap param) {
         RESTfulResult rm = failed();
         try {
-            String carNo = param.get("carNo") == null ? "":param.get("carNo").toString();
-            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
-            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
-            String baseSpotNo = param.get("baseSpotNo") == null ? "": param.get("baseSpotNo").toString();
-            String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
-            String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
-            String forwardingUnitName = param.get("forwardingUnitName") == null ? "": param.get("forwardingUnitName").toString();
-            String receivingUintName = param.get("receivingUintName") == null ? "": param.get("receivingUintName").toString();
-            String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
-
-            List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime, baseSpotNo, matterName, predictionNo, forwardingUnitName,receivingUintName,valueFlag);
+//            String carNo = param.get("carNo") == null ? "":param.get("carNo").toString();
+//            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
+//            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
+//            String baseSpotNo = param.get("baseSpotNo") == null ? "": param.get("baseSpotNo").toString();
+//            String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
+//            String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
+//            String forwardingUnitName = param.get("forwardingUnitName") == null ? "": param.get("forwardingUnitName").toString();
+//            String receivingUintName = param.get("receivingUintName") == null ? "": param.get("receivingUintName").toString();
+//            String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
+
+//            List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime, baseSpotNo, matterName, predictionNo, forwardingUnitName,receivingUintName,valueFlag);
+            List<String> rows = meterWorkCarActualFirstService.distinctCarNo(param);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();

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

@@ -2827,6 +2827,9 @@
     <if test="valueFlag != null and valueFlag != ''">
       and  value_flag = #{valueFlag}
     </if>
+    <if test="isPreScale != null and isPreScale != ''">
+      and  is_pre_scale = #{isPreScale}
+    </if>
   </select>
 
   <update id="repairPre" parameterType="java.util.HashMap">

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -121,7 +121,8 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
     RESTfulResult doCraneNetDbWf(MeterWorkCarActualFirst one, MeterWorkCarActual two, MeterMonitorNote three) throws Exception;
 
     //根据传入时间和车号，查询给定时间段去重车号
-    List<String> distinctCarNo(String carNo, String startTime, String endTime,String baseSpotNo,String matterName,String predictionNo,String forwardingUnitName,String receivingUintName,String valueFlag);
+//    List<String> distinctCarNo(String carNo, String startTime, String endTime,String baseSpotNo,String matterName,String predictionNo,String forwardingUnitName,String receivingUintName,String valueFlag);
+    List<String> distinctCarNo(HashMap<String, Object> params);
 
     String mixedLoading(String actualNo1, String actualNo2,String actualNo3, String predictionNo1,String predictionNo2);
 

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -2927,17 +2927,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctCarNo(String carNo, String startTime, String endTime,String baseSpotNo,String matterName,String predictionNo,String forwardingUnitName,String receivingUintName,String valueFlag) {
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("carNo", carNo);
-        obj.put("startTime", startTime);
-        obj.put("endTime", endTime);
-        obj.put("baseSpotNo", baseSpotNo);
-        obj.put("matterName", matterName);
-        obj.put("predictionNo", predictionNo);
-        obj.put("forwardingUnitName", forwardingUnitName);
-        obj.put("receivingUintName", receivingUintName);
-        obj.put("valueFlag", valueFlag);
+    public List<String> distinctCarNo(HashMap<String, Object> obj) {
+//        HashMap<String, Object> obj = new HashMap<>();
+//        obj.put("carNo", carNo);
+//        obj.put("startTime", startTime);
+//        obj.put("endTime", endTime);
+//        obj.put("baseSpotNo", baseSpotNo);
+//        obj.put("matterName", matterName);
+//        obj.put("predictionNo", predictionNo);
+//        obj.put("forwardingUnitName", forwardingUnitName);
+//        obj.put("receivingUintName", receivingUintName);
+//        obj.put("valueFlag", valueFlag);
         List<String> list = meterWorkCarActualFirstMapper.distinctCarNo(obj).stream().map(MeterWorkCarActualFirst::getCarNo).collect(Collectors.toList());
         return list;
     }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/controller/MeterWorkOldAndNew.java

@@ -5,6 +5,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.xml

@@ -319,7 +319,38 @@
 
   <select id="listBynoPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
-    <include refid="whereLike"/>
+    <where> 1 = 1
+      <if test="actualNo != null and actualNo != ''">
+        and ACTUAL_NO LIKE '%${actualNo}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="carriageNum != null">
+        and CARRIAGE_NUM = #{carriageNum}
+      </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="videoName != null and videoName != ''">
+        and VIDEO_NAME LIKE '%${videoName}%'
+      </if>
+      <if test="soundName != null and soundName != ''">
+        and SOUND_NAME LIKE '%${soundName}%'
+      </if>
+      <if test="trackWay != null and trackWay != ''">
+        and TRACK_WAY LIKE '%${trackWay}%'
+      </if>
+      <if test="isDispose != null and isDispose != ''">
+        and IS_DISPOSE LIKE '%${isDispose}%'
+      </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>
   </select>
   
 </mapper>

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -120,6 +120,18 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "web端--汽车衡一次、洁净数据界面获取委托未过期的倒序列表", notes = "不分页模糊查询")
+    @PostMapping(value = "/noPageDesc")
+    public RESTfulResult noPageDesc(@RequestBody HashMap parmas) {
+        try {
+            List<PreTrackScale> list = preTrackScaleService.noPageDesc(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -18,6 +18,7 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
 
     List<PreTrackScale> likeByDesc(Map<String, Object> var1);
     List<PreTrackScale> webLikeByDesc(Map<String, Object> var1);
+    List<PreTrackScale> noPageDesc(Map<String, Object> var1);
 
     List<PreTrackScale> selectuselist(@Param( value = "carNo") String carNo);
 

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3462,4 +3462,39 @@
       and TRUST_AVAILABILITY_TIME >= SYSDATE
     order By TRUST_DATE_TIME desc
   </select>
+
+  <select id="noPageDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="carNo != null and carNo != ''">
+      and CAR_NO like '%${carNo}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME like '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO = #{receivingUintNo}
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME like '%${receivingUintName}%'
+    </if>
+    <if test="materialNo != null and materialNo != ''">
+      and MATERIAL_NO = #{materialNo}
+    </if>
+    <if test="materialName != null and materialName != ''">
+      and MATERIAL_NAME like '%${materialName}%'
+    </if>
+    <if test="meterTypeNo != null and meterTypeNo != ''">
+      and METER_TYPE_NO = #{meterTypeNo}
+    </if>
+    <if test="meterTypeName != null and meterTypeName != ''">
+      and METER_TYPE_NAME = #{meterTypeName}
+    </if>
+    and value_flag != ('3')
+    and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
+    order By TRUST_DATE_TIME desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/pretrack/pretrackscale/service/IPreTrackScaleService.java

@@ -27,6 +27,7 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
     List<PreTrackScale> selectlist(String carNo);
     PageList<PreTrackScale> likeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
     PageList<PreTrackScale> webLikeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
+    List<PreTrackScale> noPageDesc(Map<String, Object> params);
 
     List<PreTrackScale> selectByCarNo(String carNo, String valueFlag);
 

src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -137,6 +137,12 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         return pageInfo;
     }
 
+    @Override
+    public List<PreTrackScale> noPageDesc(Map<String, Object> params) {
+        List<PreTrackScale> rows = preTrackScaleMapper.noPageDesc(params);
+        return rows;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<PreTrackScale> selectView(HashMap param) {