轨迹接口提交(湖南)

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java

@@ -193,40 +193,40 @@ public class SkTrailController extends ApiController implements ExcelControllerI
      */
     @PostMapping("query")
     @ApiOperation(value = "以人侦查_获取轨迹接口")
-    //@OperLog(message = "公共_获取轨迹接口", operation = OperationType.QUERY)
+    @OperLog(message = "公共_获取轨迹接口", operation = OperationType.QUERY)
     public MapRestResult query(@RequestBody SkTrailParam sktrailParam,HttpServletRequest request) {
         List<SkTrailVO> list = new ArrayList<>();
         // 根据标识号查看是否为演示数据  演示数据直接走数据库
-//        if("dev".equals(environment)||SkTextUtilServiceImpl.queryText(sktrailParam.getLikeValue()).size()>0){
-//            //分页
-//            Page page = new Page(sktrailParam.getPage(), sktrailParam.getPageSize());
-//            QueryWrapper queryWrapper = new QueryWrapper();
-//            queryWrapper.eq("isDeleted", "0");
-//            queryWrapper.select("objectValue","objectType","objectName");
-//            if (sktrailParam.getLikeField() != null && !sktrailParam.getLikeField().equals("")) {
-//                queryWrapper.eq("objectType", sktrailParam.getLikeField());
-//            }
-//            if (sktrailParam.getLikeValue() != null && !sktrailParam.getLikeValue().equals("")) {
-//                queryWrapper.like("objectValue", sktrailParam.getLikeValue());
-//            }
-//            //时间
-//            if (sktrailParam.getKssj() != null && !sktrailParam.getKssj().equals("")) {
-//                queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getKssj());
-//            }
-//            if (sktrailParam.getJssj() != null && !sktrailParam.getJssj().equals("")) {
-//                queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getJssj());
-//            }
-//
-//            queryWrapper.groupBy("objectValue");
-//            queryWrapper.groupBy("objectType");
-//            queryWrapper.groupBy("objectName");
-//
-//            IPage page1 = skTrailService.page(page, queryWrapper);
-//            List<SkTrail> records = page1.getRecords();
-//            for (SkTrail skTrail : records) {
-//                list.add(new SkTrailVO(skTrail, findByBh(skTrail.getObjectvalue(),skTrail.getObjecttype())));
-//            }
-//        }
+        /*if(SkTextUtilServiceImpl.queryText(sktrailParam.getLikeValue()).size()>0){
+            //分页
+            Page page = new Page(sktrailParam.getPage(), sktrailParam.getPageSize());
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("isDeleted", "0");
+            queryWrapper.select("objectValue","objectType","objectName");
+            if (sktrailParam.getLikeField() != null && !sktrailParam.getLikeField().equals("")) {
+                queryWrapper.eq("objectType", sktrailParam.getLikeField());
+            }
+            if (sktrailParam.getLikeValue() != null && !sktrailParam.getLikeValue().equals("")) {
+                queryWrapper.like("objectValue", sktrailParam.getLikeValue());
+            }
+            //时间
+            if (sktrailParam.getKssj() != null && !sktrailParam.getKssj().equals("")) {
+                queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getKssj());
+            }
+            if (sktrailParam.getJssj() != null && !sktrailParam.getJssj().equals("")) {
+                queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getJssj());
+            }
+
+            queryWrapper.groupBy("objectValue");
+            queryWrapper.groupBy("objectType");
+            queryWrapper.groupBy("objectName");
+
+            IPage page1 = skTrailService.page(page, queryWrapper);
+            List<SkTrail> records = page1.getRecords();
+            for (SkTrail skTrail : records) {
+                list.add(new SkTrailVO(skTrail, findByBh(skTrail.getObjectvalue(),skTrail.getObjecttype())));
+            }
+        }*/
         // 真实API
       if(sktrailParam.getLikeField().equals("wbgj")){
           list = interfaceAPI.getWbXx(sktrailParam.getLikeValue(),sktrailParam.getKssj(),sktrailParam.getJssj(),request,sktrailParam.getPage(),sktrailParam.getPageSize());
@@ -504,7 +504,7 @@ public class SkTrailController extends ApiController implements ExcelControllerI
 
     @PostMapping("/export")
     @ApiOperation("Excel接口")
-    //@OperLog(message = "Excel接口(轨迹导出)", operation = OperationType.QUERY)
+    @OperLog(message = "Excel接口(轨迹导出)", operation = OperationType.QUERY)
     public void export(HttpServletResponse response,@RequestBody SkTrailParam sktrailParam,HttpServletRequest request)throws Exception{
         List<SkTrailVO> list = new ArrayList<>();
         // 根据标识号查看是否为演示数据  演示数据直接走数据库