Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -41,5 +41,7 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
                                     String alertTypeCode ,
                                     String alertSourceCode,
                                     String startTime,
-                                    String endTime);
+                                    String endTime,
+                                    String data,
+                                    String lift);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -126,8 +126,16 @@
             <if test="alertSourceCode!= null ">
                 and alert_source_code = #{alertSourceCode}
             </if>
+            <if test="data != null and lift == 'ascend'">
+                order by #{data} ASC  limit #{current},#{size}
+            </if>
+            <if test="data != null and lift == 'descend'">
+                order by #{data} DESC  limit #{current},#{size}
+            </if>
+            <if test="data == null ">
+                order by call_time DESC  limit #{current},#{size}
+            </if>
         </where>
-        order by call_time DESC limit #{current},#{size}
     </select>
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -141,29 +141,30 @@ public class AlertCalledController extends BaseController {
     @GetMapping(value = "/list")
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize, String sort, AlertCalled alertCalled, Integer alertStatus,
-                                                      String alertTypeCode ,
+                                                      String alertTypeCode,
                                                       String alertSourceCode,
                                                       String startTime,
                                                       String endTime){
         Page<AlertCalled> pageBean;
- /*       IPage<AlertCalled> page;
-
-        String sort, AlertCalled alertCalled,
+        IPage<AlertCalled> page;
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
-
+        /*  page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
+        return ResponseHelper.buildResponse(page);*/
         setQueryWrapper(alertCalledQueryWrapper, alertCalled,sort);
-*/
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
+
+        /* bug2407 表头筛选失效 补充条件方法 XML中添加了排序条件判断  data代表排序条件 lift 升降序 陈召 2021-09-03 开始*/
         /* bug2408 筛选参数解析异常  修改筛选条件方法 修改入参分离筛选条件
         alertStatus 警情状态  alertTypeCode 报警类型code  alertSourceCode 警情来源code
         陈召 2021-08-21 开始*/
-        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(pageBean, alertStatus, alertTypeCode, alertSourceCode, startTime, endTime);
-        /* bug2408 筛选参数解析异常  修改筛选条件方法 陈召 2021-08-21 结束*/
+        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(pageBean, alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,sort);
         return ResponseHelper.buildResponse(alertCalledIPage);
+        /* bug2408 筛选参数解析异常  修改筛选条件方法 陈召 2021-08-21 结束*/
+        /* bug2407 表头筛选失效 补充条件方法 XML中添加了排序条件判断  data代表排序条件 lift 升降序 陈召 2021-09-03 结束*/
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -131,18 +131,22 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 
     /**
      * 接警记录  列表分页查询
-     **/   /* bug2408 筛选参数解析异常 修改筛选条件方法 陈召 2021-08-21 开始*/
+     **/   /* bug2407 筛选参数解析异常 修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序 陈召 2021-09-03 开始*/
     public IPage<AlertCalled> queryForCalledList(Page pageBean,Integer alertStatus,
                                            String alertTypeCode ,
                                            String alertSourceCode,
                                            String startTime,
-                                           String endTime) {
-        List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime);
+                                           String endTime,
+                                           String sort) {
+        String[] split = sort.split(",");
+        String data = RedisKey.humpToLine(split[0]);
+        String lift  =split[1];
+        List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,data,lift);
         IPage<AlertCalled> iPage = new Page<>();
         iPage.setRecords(list);
         iPage.setTotal(list.size());
         return iPage;
-        /* bug2408 筛选参数解析异常 修改筛选条件方法 陈召 2021-08-21 结束*/
+        /* bug2407 表头筛选失效 补充条件方法 XML中添加了排序条件判断  data代表排序条件 lift 升降序 陈召 2021-09-03 结束*/
     }