巡检统计接口编写

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -211,7 +211,9 @@ public interface PlanTaskMapper extends BaseMapper {
     Map<String,Object> getStatisticsByTypeHG(@Param("name") String name,@Param("timeType") String timeType);
 
     //根据日线路（今日），月线路（当月）。季度线路（本季度），年线路（本年） 获取线路关键区域
-   List<Map<String,Object>> getLinetype(@Param("nameType") String nameType);
+   List<Map<String,Object>> getLinetype(@Param("offset") Long offset,@Param("pageSize") int pageSize,@Param("name") String name);
+    //根据日线路（今日），月线路（当月）。季度线路（本季度），年线路（本年） 获取线路关键区域
+    long getLinetypecount(@Param("name") String name);
 
     //根据线路关键字过滤，日线路（今日），月线路（当月）。季度线路（本季度），年线路（本年） 不合格
     List<Map<String,Object>> getLinetypeUnqualified(@Param("offset") Long offset,@Param("pageSize") int pageSize,@Param("name") String name,@Param("timeType") String timeType);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/TaskServiceImpl.java

@@ -635,26 +635,176 @@ public class TaskServiceImpl implements ITaskService {
     }
 
     @Override
-    public List<Map<String, Object>> getLinetype(String nameType) {
-        return planTaskMapper.getLinetype(nameType);
+    public HashMap<String, Object> getLinetype(int pageNumber,int pageSize,String nameType) {
+        CommonPageable commonPageable=new CommonPageable(pageNumber,  pageSize);
+        List<Map<String, Object>> data= planTaskMapper.getLinetype(commonPageable.getOffset(),commonPageable.getPageSize(),nameType);
+        Long total= planTaskMapper.getLinetypecount(nameType);
+        Page<Map<String, Object>> result = new PageImpl<Map<String, Object>>(data, commonPageable, total);
+
+        List< HashMap<String, Object>> colModel=new ArrayList<>();
+        HashMap<String, Object> temph1 = new HashMap<>();
+        temph1.put("fid","name");
+        temph1.put("dataIndex","name");
+        temph1.put("name"," 巡检区域");
+        temph1.put("title","巡检区域");
+        temph1.put("type","dataGrid");
+        temph1.put("key","name");
+        colModel.add(temph1);
+        HashMap<String, Object> dataGridMock = new HashMap<>();
+        dataGridMock.put("current",result.getNumber()+1);
+        dataGridMock.put("total",result.getTotalElements());
+        dataGridMock.put("pagination",false);
+        dataGridMock.put("totalPage",result.getTotalPages());
+        dataGridMock.put("dataList",result.getContent());
+        dataGridMock.put("pageSize",result.getSize());
+        HashMap<String, Object> DATE = new HashMap<>();
+        DATE.put("dataGridMock",dataGridMock);
+        DATE.put("colModel",colModel);
+        HashMap<String, Object> temph = new HashMap<>();
+        temph.put("result",DATE);
+        temph.put("status",200);
+        temph.put("message","");
+        return temph;
     }
 
     @Override
-    public Page<Map<String, Object>> getLinetypeUnqualified(int pageNumber,int pageSize,String nameType, String timeType) {
+    public HashMap<String, Object> getLinetypeUnqualified(int pageNumber,int pageSize,String nameType, String timeType) {
 
         CommonPageable commonPageable=new CommonPageable(pageNumber,  pageSize);
         Long total= planTaskMapper.countLinetypeUnqualified(nameType,timeType);
         List<Map<String,Object>>  content=planTaskMapper.getLinetypeUnqualified(commonPageable.getOffset(), pageSize, nameType,  timeType);
         Page<Map<String, Object>> result = new PageImpl<Map<String, Object>>(content, commonPageable, total);
-        return result;
+        List< HashMap<String, Object>> colModel=new ArrayList<>();
+        HashMap<String, Object> temph1 = new HashMap<>();
+        temph1.put("fid","pointNum");
+        temph1.put("dataIndex","pointNum");
+        temph1.put("name"," 巡检点编号");
+        temph1.put("title","巡检点编号");
+        temph1.put("type","dataGrid");
+        temph1.put("key","pointNum");
+        colModel.add(temph1);
+
+        HashMap<String, Object> temph2 = new HashMap<>();
+        temph2.put("fid","name");
+        temph2.put("dataIndex","name");
+        temph2.put("name"," 巡检点名称");
+        temph2.put("title","巡检点名称");
+        temph2.put("type","dataGrid");
+        temph2.put("key","name");
+        colModel.add(temph2);
+
+        HashMap<String, Object> temph3 = new HashMap<>();
+        temph3.put("fid","bizOrgName");
+        temph3.put("dataIndex","bizOrgName");
+        temph3.put("name"," 所属部门");
+        temph3.put("title","所属部门");
+        temph3.put("type","dataGrid");
+        temph3.put("key","bizOrgName");
+        colModel.add(temph3);
+
+        HashMap<String, Object> temph4 = new HashMap<>();
+        temph4.put("fid","actor");
+        temph4.put("dataIndex","actor");
+        temph4.put("name"," 执行人");
+        temph4.put("title","执行人");
+        temph4.put("type","dataGrid");
+        temph4.put("key","actor");
+        colModel.add(temph4);
+        HashMap<String, Object> temph5 = new HashMap<>();
+        temph5.put("fid","create_date");
+        temph5.put("dataIndex","create_date");
+        temph5.put("name"," 时间");
+        temph5.put("title","时间");
+        temph5.put("type","dataGrid");
+        temph5.put("key","create_date");
+        colModel.add(temph5);
+
+        HashMap<String, Object> dataGridMock = new HashMap<>();
+        dataGridMock.put("current",result.getNumber()+1);
+        dataGridMock.put("total",result.getTotalElements());
+        dataGridMock.put("pagination",false);
+        dataGridMock.put("totalPage",result.getTotalPages());
+        dataGridMock.put("dataList",result.getContent());
+        dataGridMock.put("pageSize",result.getSize());
+        HashMap<String, Object> DATE = new HashMap<>();
+        DATE.put("dataGridMock",dataGridMock);
+        DATE.put("colModel",colModel);
+        HashMap<String, Object> temph = new HashMap<>();
+        temph.put("result",DATE);
+        temph.put("status",200);
+        temph.put("message","");
+        return temph;
     }
 
     @Override
-    public Page<Map<String, Object>> getLinetypeNotInspected(int pageNumber,int pageSize,String nameType, String timeType) {
+    public HashMap<String, Object> getLinetypeNotInspected(int pageNumber,int pageSize,String nameType, String timeType) {
         CommonPageable commonPageable=new CommonPageable(pageNumber,  pageSize);
         Long total= planTaskMapper.countLinetypeNotInspected(nameType,timeType);
         List<Map<String,Object>>  content=planTaskMapper.getLinetypeNotInspected(commonPageable.getOffset(), pageSize, nameType,  timeType);
         Page<Map<String, Object>> result = new PageImpl<Map<String, Object>>(content, commonPageable, total);
-        return result;
+        List< HashMap<String, Object>> colModel=new ArrayList<>();
+
+
+        HashMap<String, Object> temph2 = new HashMap<>();
+        temph2.put("fid","routeName");
+        temph2.put("dataIndex","routeName");
+        temph2.put("name"," 路线名称");
+        temph2.put("title","路线名称");
+        temph2.put("type","dataGrid");
+        temph2.put("key","routeName");
+        colModel.add(temph2);
+
+        HashMap<String, Object> temph1 = new HashMap<>();
+        temph1.put("fid","pointNum");
+        temph1.put("dataIndex","pointNum");
+        temph1.put("name"," 巡检点编号");
+        temph1.put("title","巡检点编号");
+        temph1.put("type","dataGrid");
+        temph1.put("key","pointNum");
+        colModel.add(temph1);
+
+        HashMap<String, Object> temph0 = new HashMap<>();
+        temph0.put("fid","name");
+        temph0.put("dataIndex","name");
+        temph0.put("name"," 巡检点名称");
+        temph0.put("title","巡检点名称");
+        temph0.put("type","dataGrid");
+        temph0.put("key","name");
+        colModel.add(temph0);
+
+        HashMap<String, Object> temph3 = new HashMap<>();
+        temph3.put("fid","bizOrgName");
+        temph3.put("dataIndex","bizOrgName");
+        temph3.put("name"," 所属部门");
+        temph3.put("title","所属部门");
+        temph3.put("type","dataGrid");
+        temph3.put("key","bizOrgName");
+        colModel.add(temph3);
+
+        HashMap<String, Object> temph4 = new HashMap<>();
+        temph4.put("fid","actor");
+        temph4.put("dataIndex","actor");
+        temph4.put("name"," 执行人");
+        temph4.put("title","执行人");
+        temph4.put("type","dataGrid");
+        temph4.put("key","actor");
+        colModel.add(temph4);
+
+
+        HashMap<String, Object> dataGridMock = new HashMap<>();
+        dataGridMock.put("current",result.getNumber()+1);
+        dataGridMock.put("total",result.getTotalElements());
+        dataGridMock.put("pagination",false);
+        dataGridMock.put("totalPage",result.getTotalPages());
+        dataGridMock.put("dataList",result.getContent());
+        dataGridMock.put("pageSize",result.getSize());
+        HashMap<String, Object> DATE = new HashMap<>();
+        DATE.put("dataGridMock",dataGridMock);
+        DATE.put("colModel",colModel);
+        HashMap<String, Object> temph = new HashMap<>();
+        temph.put("result",DATE);
+        temph.put("status",200);
+        temph.put("message","");
+        return temph;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ITaskService.java

@@ -177,13 +177,13 @@ public interface ITaskService {
     List<Map<String, Object>> getStatisticsByTypeHG( String name, String timeType);
 
     //根据日线路（今日），月线路（当月）。季度线路（本季度），年线路（本年） 获取线路关键区域
-    List<Map<String,Object>> getLinetype( String nameType);
+    HashMap<String, Object> getLinetype( int pageNumber,int pageSize,String nameType);
 
     //根据线路关键字过滤，日线路（今日），月线路（当月）。季度线路（本季度），年线路（本年） 不合格
-    Page <Map<String,Object>> getLinetypeUnqualified(int offset,int pageSize, String nameType,String timeType);
+    HashMap<String, Object> getLinetypeUnqualified(int offset,int pageSize, String nameType,String timeType);
 
     //根据线路关键字过滤，日线路（今日），月线路（当月）。季度线路（本季度），年线路（本年）  未巡检
-    Page<Map<String,Object>> getLinetypeNotInspected( int offset,int pageSize,String nameType, String timeType);
+    HashMap<String, Object> getLinetypeNotInspected( int offset,int pageSize,String nameType, String timeType);