增加自定义排序

xieb

2024-01-31 24d12bfdac4a3925eb05655ecfc03c9e9c1383a4

增加自定义排序

 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/fegin/INkyClient.java

@@ -87,7 +87,11 @@
    List<AlarmGetVO> getAlarmDetail(@RequestBody AlarmGetVO alarmGet);

    @PostMapping(GET_ALARM_DETAIL_PAGE)
    PageVO<AlarmGetVO> getAlarmDetailPage(@RequestParam("current") Integer current, @RequestParam("size") Integer size,@RequestBody AlarmGetVO alarmGet);
    PageVO<AlarmGetVO> getAlarmDetailPage(@RequestParam("current") Integer current,
                                          @RequestParam("size") Integer size,
                                          @RequestBody AlarmGetVO alarmGet,
                                          @RequestParam("ascs") String ascs,
                                          @RequestParam("desc") String descs);

    @PostMapping(UPDATE_ALARM_GET)
    Boolean updateAlarmGet(@RequestBody AlarmGetVO alarmGet);

 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/fegin/INkyClientFallback.java

@@ -4,6 +4,7 @@
import cn.gistack.nky.vo.AlarmGetVO;
import cn.gistack.nky.vo.PageVO;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

@@ -47,7 +48,9 @@
    }

    @Override
    public PageVO<AlarmGetVO> getAlarmDetailPage(Integer current, Integer size, AlarmGetVO alarmGet) {
    public PageVO<AlarmGetVO> getAlarmDetailPage(Integer current, Integer size, AlarmGetVO alarmGet,
                                                 String ascs,
                                                 String descs) {
        return null;
    }


 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java

@@ -84,10 +84,14 @@

    @Override
    @PostMapping(GET_ALARM_DETAIL_PAGE)
    public PageVO<AlarmGetVO> getAlarmDetailPage(Integer current, Integer size, AlarmGetVO alarmGet) {
    public PageVO<AlarmGetVO> getAlarmDetailPage(Integer current, Integer size, AlarmGetVO alarmGet,
                                                 String ascs,
                                                 String descs) {
        Query query = new Query();
        query.setCurrent(current);
        query.setSize(size);
        query.setAscs(ascs);
        query.setDescs(descs);
        IPage<AlarmGetVO> alarmDetailPage = alarmGetService.getAlarmDetailPage(Condition.getPage(query), alarmGet);

        PageVO<AlarmGetVO> pageVO = new PageVO();

 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml

@@ -91,14 +91,12 @@
            AND acb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
        </if>
        AND NAG.dam_id =  #{vo.damId}
        ORDER BY NAG."TIME" DESC
        )temp
        LEFT JOIN SJZT_MD."att_wy_cd_base" awcb ON awcb."res_cd" =   temp.DAM_ID AND temp.POINT_ID = awcb."cd"
        WHERE 1=1
        <if test="vo.cdName != null and vo.cdName !='' and vo.type == 3">
            AND awcb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
        </if>
        order by time desc

    </select>
    <select id="getAlarmVo" resultType="cn.gistack.nky.vo.AlarmGetVO">

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java

@@ -14,6 +14,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -147,7 +148,9 @@
    @ApiOperation(value = "大坝安全统计-大坝安全监测预警详情", notes = "大坝安全统计-大坝安全监测预警详情")
    @GetMapping(value = "/alarmDetailPage")
    public R alarmDetail(AlarmGetVO alarmGet,Query query){
        PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet);
        String ascs = StringUtil.isBlank(query.getAscs())?"":query.getAscs();
        String descs = StringUtil.isBlank(query.getDescs())?"":query.getDescs();
        PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet,ascs,descs);
        return R.data(page);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml

@@ -1917,7 +1917,6 @@
                #{item}
            </foreach>
        </if>
        ORDER BY NAG.TIME DESC

    </select>