消防车辆管理相关接口开发

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

@@ -1,9 +1,14 @@
 package com.usky.fire.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemVehicle;
+import com.usky.fire.service.DemVehicleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -13,9 +18,55 @@ import org.springframework.stereotype.Controller;
  * @author JCB
  * @since 2022-10-19
  */
-@Controller
+@RestController
 @RequestMapping("/demVehicle")
 public class DemVehicleController {
 
+    @Autowired
+    private DemVehicleService demVehicleService;
+
+    /**
+     * 消防车辆管理-列表查询
+     *
+     * @param vehicleCode      车辆编号
+     * @param vehicleAbbreviat 车辆简称
+     * @param id               主键ID
+     * @param pageNum          当前页
+     * @param pageSize         每页条数
+     * @return
+     */
+    @GetMapping("vehicleList")
+    public ApiResult<CommonPage<Object>> vehicleList(@RequestParam(value = "vehicleCode", required = false) String vehicleCode,
+                                                     @RequestParam(value = "vehicleAbbreviat", required = false) String vehicleAbbreviat,
+                                                     @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                     @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demVehicleService.vehicleList(vehicleCode, vehicleAbbreviat, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防车辆管理-修改
+     *
+     * @param demVehicle
+     */
+    @Log(title = "消防车辆管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateVehicle")
+    public ApiResult<Void> updateVehicle(@RequestBody DemVehicle demVehicle) {
+        demVehicleService.updateVehicle(demVehicle);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防车辆管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "消防车辆管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delVehicle")
+    public ApiResult<Void> delVehicle(@RequestParam(value = "id") Integer id) {
+        demVehicleService.delVehicle(id);
+        return ApiResult.success();
+    }
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemVehicle.java

@@ -1,13 +1,14 @@
 package com.usky.fire.domain;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 车辆信息
@@ -390,5 +391,10 @@ public class DemVehicle implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 删除标识
+     */
+    private String deleteFlag;
+
 
 }

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

@@ -1,7 +1,8 @@
 package com.usky.fire.service;
 
-import com.usky.fire.domain.DemVehicle;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemVehicle;
 
 /**
  * <p>
@@ -13,4 +14,29 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface DemVehicleService extends CrudService<DemVehicle> {
 
+    /**
+     * 消防车辆管理-列表查询
+     *
+     * @param vehicleCode      车辆编号
+     * @param vehicleAbbreviat 车辆简称
+     * @param id               主键ID
+     * @param pageNum          当前页
+     * @param pageSize         每页条数
+     * @return
+     */
+    CommonPage<Object> vehicleList(String vehicleCode, String vehicleAbbreviat, Integer id, Integer pageNum, Integer pageSize);
+
+    /**
+     * 消防车辆管理-修改
+     *
+     * @param demVehicle
+     */
+    void updateVehicle(DemVehicle demVehicle);
+
+    /**
+     * 消防车辆管理-删除
+     *
+     * @param id 主键ID
+     */
+    void delVehicle(Integer id);
 }

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

@@ -1,11 +1,23 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.fire.domain.DemLawSituation;
 import com.usky.fire.domain.DemVehicle;
 import com.usky.fire.mapper.DemVehicleMapper;
 import com.usky.fire.service.DemVehicleService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 车辆信息 服务实现类
@@ -17,4 +29,61 @@ import org.springframework.stereotype.Service;
 @Service
 public class DemVehicleServiceImpl extends AbstractCrudService<DemVehicleMapper, DemVehicle> implements DemVehicleService {
 
+    @Override
+    public CommonPage<Object> vehicleList(String vehicleCode, String vehicleAbbreviat, Integer id, Integer pageNum, Integer pageSize){
+        List<Object> list = new ArrayList<>();
+        IPage<DemVehicle> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemVehicle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemVehicle::getId,DemVehicle::getVehicleCode,DemVehicle::getVehicleAbbreviat,
+                DemVehicle::getRadioChannel,DemVehicle::getRadioCallSign,DemVehicle::getFireOrga,
+                DemVehicle::getVehicleClassCode,DemVehicle::getLicensePlate,DemVehicle::getAssetCode,
+                DemVehicle::getEquipTime, DemVehicle::getFireFightStatus,DemVehicle::getRecordStatus,
+                DemVehicle::getPoliceListCode,DemVehicle::getCommanderName,DemVehicle::getReporter,
+                DemVehicle::getDriver,DemVehicle::getSoldier,DemVehicle::getTypeCode,
+                DemVehicle::getVehicleStatus)
+                .eq(DemVehicle::getDeleteFlag, 0)
+                .like(StringUtils.isNotBlank(vehicleAbbreviat),DemVehicle::getVehicleAbbreviat,vehicleAbbreviat)
+                .like(StringUtils.isNotBlank(vehicleCode),DemVehicle::getVehicleCode,vehicleCode)
+                .eq(id!=null&&id!=0,DemVehicle::getId,id)
+                .orderByDesc(DemVehicle::getId);
+        page=this.page(page, queryWrapper);
+        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("vehicleCode", page.getRecords().get(i).getVehicleCode());
+            map.put("vehicleAbbreviat", page.getRecords().get(i).getVehicleAbbreviat());
+            map.put("radioChannel", page.getRecords().get(i).getRadioChannel());
+            map.put("radioCallSign", page.getRecords().get(i).getRadioCallSign());
+            map.put("fireOrga", page.getRecords().get(i).getFireOrga());
+            map.put("vehicleClassCode", page.getRecords().get(i).getVehicleClassCode());
+            map.put("licensePlate", page.getRecords().get(i).getLicensePlate());
+            map.put("assetCode", page.getRecords().get(i).getAssetCode());
+            map.put("equipTime", page.getRecords().get(i).getEquipTime());
+            map.put("fireFightStatus", page.getRecords().get(i).getFireFightStatus());
+            map.put("recordStatus", page.getRecords().get(i).getRecordStatus());
+            map.put("policeListCode", page.getRecords().get(i).getPoliceListCode());
+            map.put("commanderName", page.getRecords().get(i).getCommanderName());
+            map.put("reporter", page.getRecords().get(i).getReporter());
+            map.put("driver", page.getRecords().get(i).getDriver());
+            map.put("soldier", page.getRecords().get(i).getSoldier());
+            map.put("typeCode", page.getRecords().get(i).getTypeCode());
+            map.put("vehicleStatus", page.getRecords().get(i).getVehicleStatus());
+            list.add(map);
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public void updateVehicle(DemVehicle demVehicle){
+        this.updateById(demVehicle);
+    }
+
+    @Override
+    public void delVehicle(Integer id) {
+        DemVehicle demVehicle = new DemVehicle();
+        demVehicle.setId(id);
+        demVehicle.setDeleteFlag("1");
+        this.updateById(demVehicle);
+    }
+
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemVehicleMapper.xml

@@ -90,6 +90,7 @@
         <result column="sjjg_id" property="sjjgId" />
         <result column="zhi_dui" property="zhiDui" />
         <result column="update_time" property="updateTime" />
+        <result column="delete_flag" property="deleteFlag" />
     </resultMap>
 
 </mapper>