'接警处置柱状图统计和详情展示-new'

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/JcjAjxxController.java

@@ -42,8 +42,8 @@ public class JcjAjxxController {
      */
     @GetMapping("jcjAjxxList")
     public ApiResult<CommonPage<JcjAjxx>> jcjAjxxList(@RequestParam(value="streetTown") String streetTown,
-                                               @RequestParam(value = "startDate") String startDate,
-                                               @RequestParam(value = "endDate") String endDate,
+                                               @RequestParam(value = "startDate", required = false) String startDate,
+                                               @RequestParam(value = "endDate", required = false) String endDate,
                                                @RequestParam(value = "caseType") String caseType,
                                                @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
@@ -56,8 +56,8 @@ public class JcjAjxxController {
      */
     @GetMapping("jcjAjxxStatistics")
     public ApiResult<Map<String,Object>> jcjAjxxStatistics(@RequestParam(value="streetTown") String streetTown,
-                                                           @RequestParam(value = "startDate") String startDate,
-                                                           @RequestParam(value = "endDate") String endDate){
+                                                           @RequestParam(value = "startDate", required = false) String startDate,
+                                                           @RequestParam(value = "endDate", required = false) String endDate){
         return ApiResult.success(jcjAjxxService.jcjAjxxStatistics(streetTown, startDate, endDate));
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/JcjAjxxService.java

@@ -19,4 +19,6 @@ public interface JcjAjxxService extends CrudService<JcjAjxx> {
 
     Map<String,Object> jcjAjxxStatistics(String streetTown, String startDate, String endDate);
 
+    Integer ajCount(String streetTown, String startDate, String endDate, String caseType);
+
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/JcjAjxxServiceImpl.java

@@ -12,9 +12,11 @@ import com.usky.fire.domain.JcjAjxx;
 import com.usky.fire.mapper.JcjAjxxMapper;
 import com.usky.fire.service.JcjAjxxService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
 
@@ -29,8 +31,9 @@ import java.util.List;
 @DS("mhsystem")
 @Service
 public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAjxx> implements JcjAjxxService {
+
     @Override
-    CommonPage<JcjAjxx> jcjAjxxList(String streetTown, String startDate, String endDate, String caseType, Integer pageNum, Integer pageSize){
+    public CommonPage<JcjAjxx> jcjAjxxList(String streetTown, String startDate, String endDate, String caseType, Integer pageNum, Integer pageSize){
         List<String> streetTownList = new ArrayList<>();
         if(StringUtils.isNotBlank(streetTown)){
             String[] splitList = streetTown.split(",");
@@ -41,7 +44,7 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
         IPage<JcjAjxx> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<JcjAjxx> queryWrapper = Wrappers.lambdaQuery();
         if(streetTownList.size()>0){
-            queryWrapper.in(JcjAjxx::getStreettown, streetTown);
+            queryWrapper.in(JcjAjxx::getStreettown, streetTownList);
         }
         queryWrapper.between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), JcjAjxx::getLasj, startDate, endDate)
                     .eq(StringUtils.isNotBlank(caseType), JcjAjxx::getAjlx, caseType)
@@ -53,7 +56,35 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
     }
 
     @Override
-    Map<String,Object> jcjAjxxStatistics(String streetTown, String startDate, String endDate){
+    public Map<String,Object> jcjAjxxStatistics(String streetTown, String startDate, String endDate){
+        Map<String, Object> map = new HashMap<>();
+        int fireCount = 0;
+        int socialCount = 0;
+        int emergencyCount = 0;
+        fireCount = this.ajCount(streetTown, startDate, endDate, "火灾");
+        map.put("fireCount",fireCount);
+        socialCount = this.ajCount(streetTown, startDate, endDate, "社会救助");
+        map.put("socialCount",socialCount);
+        emergencyCount = this.ajCount(streetTown, startDate, endDate, "抢险救援");
+        map.put("emergencyCount",emergencyCount);
+
+        return map;
+    }
+
+    @Override
+    public Integer ajCount(String streetTown, String startDate, String endDate, String caseType){
+        List<String> streetTownList = new ArrayList<>();
+        String[] str = streetTown.split(",");
+        for(int i=0;i<str.length;i++){
+            streetTownList.add(str[i]);
+        }
+        LambdaQueryWrapper<JcjAjxx> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(JcjAjxx::getStreettown, streetTownList)
+                    .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), JcjAjxx::getLasj, startDate, endDate)
+                    .eq(JcjAjxx::getAjlx, caseType)
+                    .eq(JcjAjxx::getYxx, 0);
+        int count = this.count(queryWrapper);
 
+        return count;
     }
 }