消防水源管理-天然水源维护相关接口开发

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

@@ -10,6 +10,7 @@ import com.usky.fire.service.DemMicroStationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -69,5 +70,16 @@ public class DemMicroStationController {
         demMicroStationService.delMicroStation(id);
         return ApiResult.success();
     }
+
+    /**
+     * 消防水源管理-天然水源维护-所属中队下拉框
+     *
+     * @param branchName 支队名称
+     * @return
+     */
+    @GetMapping("microStationDroplistList")
+    public ApiResult<List<Map<String, Object>>> microStationDroplistList(@RequestParam(value = "branchName", required = false, defaultValue = "闵行支队") String branchName) {
+        return ApiResult.success(demMicroStationService.microStationDroplistList(branchName));
+    }
 }
 

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

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemMicroStation;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -41,4 +42,12 @@ public interface DemMicroStationService extends CrudService<DemMicroStation> {
      * @param id 主键ID
      */
     void delMicroStation(Integer id);
+
+    /**
+     * 消防水源管理-天然水源维护-所属中队下拉框
+     *
+     * @param branchName 支队名称
+     * @return
+     */
+    List<Map<String, Object>> microStationDroplistList(String branchName);
 }

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

@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemMicroStation;
 import com.usky.fire.mapper.DemMicroStationMapper;
 import com.usky.fire.service.DemMicroStationService;
-import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
@@ -28,33 +28,33 @@ import java.util.*;
 public class DemMicroStationServiceImpl extends AbstractCrudService<DemMicroStationMapper, DemMicroStation> implements DemMicroStationService {
 
     @Override
-    public CommonPage<Map<String, Object>> microStationList(String squadron, String stationName, Integer id, Integer pageNum, Integer pageSize){
-        List<Map<String,Object>> list = new ArrayList<>();
+    public CommonPage<Map<String, Object>> microStationList(String squadron, String stationName, Integer id, Integer pageNum, Integer pageSize) {
+        List<Map<String, Object>> list = new ArrayList<>();
         IPage<DemMicroStation> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemMicroStation> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DemMicroStation::getId,DemMicroStation::getBranchName,DemMicroStation::getSquadron,
-                DemMicroStation::getStationName,DemMicroStation::getCompanyNature,DemMicroStation::getAddress,
-                DemMicroStation::getLocation,DemMicroStation::getFixedPhone,DemMicroStation::getChargeName,
-                DemMicroStation::getChargePhone,DemMicroStation::getStationType)
-                .eq(DemMicroStation::getDeleteFlag,0)
-                .like(StringUtils.isNotBlank(squadron),DemMicroStation::getSquadron,squadron)
-                .like(StringUtils.isNotBlank(stationName),DemMicroStation::getStationName,stationName)
+        queryWrapper.select(DemMicroStation::getId, DemMicroStation::getBranchName, DemMicroStation::getSquadron,
+                DemMicroStation::getStationName, DemMicroStation::getCompanyNature, DemMicroStation::getAddress,
+                DemMicroStation::getLocation, DemMicroStation::getFixedPhone, DemMicroStation::getChargeName,
+                DemMicroStation::getChargePhone, DemMicroStation::getStationType)
+                .eq(DemMicroStation::getDeleteFlag, 0)
+                .like(StringUtils.isNotBlank(squadron), DemMicroStation::getSquadron, squadron)
+                .like(StringUtils.isNotBlank(stationName), DemMicroStation::getStationName, stationName)
                 .orderByDesc(DemMicroStation::getId);
         page = this.page(page, queryWrapper);
-        if (CollectionUtils.isNotEmpty(page.getRecords())){
+        if (CollectionUtils.isNotEmpty(page.getRecords())) {
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
-                map.put("id",page.getRecords().get(i).getId());
-                map.put("branchName",page.getRecords().get(i).getBranchName());
-                map.put("squadron",page.getRecords().get(i).getSquadron());
-                map.put("stationName",page.getRecords().get(i).getStationName());
-                map.put("companyNature",page.getRecords().get(i).getCompanyNature());
-                map.put("address",page.getRecords().get(i).getAddress());
-                map.put("location",page.getRecords().get(i).getLocation());
-                map.put("fixedPhone",page.getRecords().get(i).getFixedPhone());
-                map.put("chargeName",page.getRecords().get(i).getChargeName());
-                map.put("chargePhone",page.getRecords().get(i).getChargePhone());
-                map.put("stationType",page.getRecords().get(i).getStationType());
+                map.put("id", page.getRecords().get(i).getId());
+                map.put("branchName", page.getRecords().get(i).getBranchName());
+                map.put("squadron", page.getRecords().get(i).getSquadron());
+                map.put("stationName", page.getRecords().get(i).getStationName());
+                map.put("companyNature", page.getRecords().get(i).getCompanyNature());
+                map.put("address", page.getRecords().get(i).getAddress());
+                map.put("location", page.getRecords().get(i).getLocation());
+                map.put("fixedPhone", page.getRecords().get(i).getFixedPhone());
+                map.put("chargeName", page.getRecords().get(i).getChargeName());
+                map.put("chargePhone", page.getRecords().get(i).getChargePhone());
+                map.put("stationType", page.getRecords().get(i).getStationType());
                 list.add(map);
             }
         }
@@ -62,18 +62,38 @@ public class DemMicroStationServiceImpl extends AbstractCrudService<DemMicroStat
     }
 
     @Override
-    public void updateMicroStation(DemMicroStation demMicroStation){
-        SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+    public void updateMicroStation(DemMicroStation demMicroStation) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
         demMicroStation.setUpdateTime(dateFormat.format(new Date()));
         this.updateById(demMicroStation);
     }
 
     @Override
-    public void delMicroStation(Integer id){
+    public void delMicroStation(Integer id) {
         DemMicroStation demMicroStation = new DemMicroStation();
         demMicroStation.setId(id);
         demMicroStation.setDeleteFlag("1");
         this.updateById(demMicroStation);
     }
 
+    @Override
+    public List<Map<String, Object>> microStationDroplistList(String branchName) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        LambdaQueryWrapper<DemMicroStation> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemMicroStation::getSquadron)
+                .eq(DemMicroStation::getDeleteFlag, "0")
+                .eq(StringUtils.isNotBlank(branchName), DemMicroStation::getBranchName, branchName)
+                .orderByDesc(DemMicroStation::getId)
+                .groupBy(DemMicroStation::getSquadron);
+        List<DemMicroStation> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            for (int i = 0; i < list1.size(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("squadron", list1.get(i).getSquadron());
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
 }