燃气费用相关代码

src/main/java/com/aoyang/tms/controller/TmsGasFeeController.java

@@ -1,6 +1,8 @@
 package com.aoyang.tms.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.entity.TmsGasFee;
 import com.aoyang.tms.service.TmsGasFeeService;
 import org.springframework.web.bind.annotation.*;
@@ -9,7 +11,10 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
-import java.util.*;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
 import javax.annotation.Resource;
 
 import com.aoyang.common.result.Result;
@@ -21,10 +26,10 @@ import com.aoyang.common.param.PageParam;
 
 /**
  * <p>
-    * 燃气费用表 控制器
-    * </p>
+ * 燃气费用表 控制器
+ * </p>
  *
- * @author liujiren
+ * @author chengang
  * @since 2022-04-23
  */
 @RestController
@@ -36,25 +41,87 @@ public class TmsGasFeeController {
     @Resource
     private TmsGasFeeService tmsGasFeeService;
 
-    @ApiOperation(value = "获取tms_gas_fee列表",notes="")
-    @PostMapping("/list")
+    @ApiOperation(value = "获取tms_gas_fee分页列表", notes = "")
+    @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<TmsGasFee> pageParam) {
         Page<TmsGasFee> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         IPage<TmsGasFee> records = tmsGasFeeService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "修改tms_gas_fee",notes="根据id修改tms_gas_fee")
-    @PostMapping("/update")
-    public Result update(@RequestBody TmsGasFee tmsGasFee) {
-        Boolean flag = tmsGasFeeService.updateById(tmsGasFee);
-        return new Result<>(flag);
+    @ApiOperation(value = "获取燃气费用列表", notes = "必传参数:CycleId,TruckId")
+    @PostMapping("/list")
+    public Result list(@RequestBody TmsGasFee param) {
+        log.info("获取燃气费用列表,调用/tms/tms_gas_fee/list,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getCycleId() == null || param.getTruckId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsGasFeeService.list(param));
     }
 
-    @ApiOperation(value = "添加tms_gas_fee",notes="新增一条tms_gas_fee")
+    @ApiOperation(value = "根据id获取燃气费用详情", notes = "必传参数:Id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody TmsGasFee param) {
+        log.info("根据id获取燃气费用详情,调用/tms/tms_gas_fee/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsGasFeeService.getById(param));
+    }
+
+    @ApiOperation(value = "添加燃气费用", notes = "必传参数:GasQtyDate,GasQty,UnitPrice,GasQtyFee,Type,Kilometre,CycleId,TruckId")
     @PostMapping("/add")
-    public Result add(@RequestBody TmsGasFee tmsGasFee) {
-        Boolean flag = tmsGasFeeService.save(tmsGasFee);
-        return new Result<>(flag);
+    public Result add(@RequestHeader(value = "userId") Long userId,
+                      @RequestHeader(value = "userName") String userName,
+                      @RequestBody TmsGasFee param) {
+        log.info("添加燃气费用,调用/tms/tms_gas_fee/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getGasQtyDate() == null || param.getGasQty() == null || param.getUnitPrice() == null
+                || param.getGasQtyFee() == null || param.getType() == null || param.getKilometre() == null
+                || param.getCycleId() == null || param.getTruckId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setCreater(userId);
+        param.setCreaterName(utf8Name);
+        param.setCreateDate(LocalDateTime.now());
+
+        return new Result<>(tmsGasFeeService.save(param));
+    }
+
+    @ApiOperation(value = "修改燃气费用", notes = "必传参数:id,tmsLineCostOther.id")
+    @PostMapping("/update")
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody TmsGasFee param) {
+        log.info("修改燃气费用,调用/tms/tms_gas_fee/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(tmsGasFeeService.updateById(param));
+    }
+
+    @ApiOperation(value = "删除燃气费用", notes = "必传参数:id")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody TmsGasFee param) {
+        log.info("删除燃气费用,调用/tms/tms_gas_fee/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsGasFeeService.removeById(param));
     }
 }

src/main/java/com/aoyang/tms/controller/TmsLineCostController.java

@@ -6,8 +6,6 @@ import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.controller.param.TmsLineCostAddParam;
 import com.aoyang.tms.entity.TmsLineCost;
 import com.aoyang.tms.entity.TmsLineCostOther;
-import com.aoyang.tms.entity.TruckDept;
-import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.tms.service.TmsLineCostService;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.time.LocalDateTime;
-import java.util.*;
 import javax.annotation.Resource;
 
 import com.aoyang.common.result.Result;
@@ -34,7 +31,7 @@ import com.aoyang.common.param.PageParam;
  * 线路费用表 控制器
  * </p>
  *
- * @author liujiren
+ * @author chengang
  * @since 2022-04-23
  */
 @RestController
@@ -74,13 +71,14 @@ public class TmsLineCostController {
         return new Result<>(tmsLineCostService.getOne(param));
     }
 
-    @ApiOperation(value = "添加线路费用", notes = "必传参数:LineStart,LineEnd,Kilometre")
+    @ApiOperation(value = "添加线路费用", notes = "必传参数:LineStart,LineEnd,Kilometre,CycleId,TruckId")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,
                       @RequestBody TmsLineCostAddParam param) {
         log.info("添加线路费用,调用/tms/tms_line_cost/add,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getLineStart() == null || param.getLineEnd() == null || param.getKilometre() == null) {
+        if (param == null || param.getLineStart() == null || param.getLineEnd() == null || param.getKilometre() == null
+                || param.getCycleId() == null || param.getTruckId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         if (param.getList() != null && param.getList().size() > 0) {

src/main/java/com/aoyang/tms/service/TmsGasFeeService.java

@@ -3,14 +3,26 @@ package com.aoyang.tms.service;
 import com.aoyang.tms.entity.TmsGasFee;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 燃气费用表 服务类
  * </p>
  *
- * @author liujiren
+ * @author chengang
  * @since 2022-04-23
  */
 public interface TmsGasFeeService extends IService<TmsGasFee> {
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取燃气费用列表
+     * @Date 2022/4/23
+     * @Param
+     **/
+    List<TmsGasFee> list(TmsGasFee param);
+
+
 }

src/main/java/com/aoyang/tms/service/TmsLineCostService.java

@@ -1,13 +1,9 @@
 package com.aoyang.tms.service;
 
-import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.controller.param.TmsLineCostAddParam;
 import com.aoyang.tms.controller.vo.TmsLineCostDetail;
 import com.aoyang.tms.controller.vo.TmsLineCostListVO;
-import com.aoyang.tms.controller.vo.TruckDeptListVO;
 import com.aoyang.tms.entity.TmsLineCost;
-import com.aoyang.tms.entity.TruckDept;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.math.BigDecimal;
@@ -18,7 +14,7 @@ import java.util.List;
  * 线路费用表 服务类
  * </p>
  *
- * @author liujiren
+ * @author chengang
  * @since 2022-04-23
  */
 public interface TmsLineCostService extends IService<TmsLineCost> {

src/main/java/com/aoyang/tms/service/impl/TmsGasFeeServiceImpl.java

@@ -4,18 +4,35 @@ package com.aoyang.tms.service.impl;
 import com.aoyang.tms.entity.TmsGasFee;
 import com.aoyang.tms.mapper.TmsGasFeeMapper;
 import com.aoyang.tms.service.TmsGasFeeService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 燃气费用表 服务实现类
  * </p>
  *
- * @author liujiren
+ * @author chengang
  * @since 2022-04-23
  */
 @Service
 public class TmsGasFeeServiceImpl extends ServiceImpl<TmsGasFeeMapper, TmsGasFee> implements TmsGasFeeService {
 
+    @Override
+    public List<TmsGasFee> list(TmsGasFee param) {
+        QueryWrapper<TmsGasFee> queryWrapper = new QueryWrapper<>();
+        if (param.getCycleId() != null) {
+            queryWrapper.eq("cycle_id", param.getCycleId());
+        }
+        if (param.getTruckId() != null) {
+            queryWrapper.eq("truck_id", param.getTruckId());
+        }
+        List<TmsGasFee> list = list(queryWrapper.orderByAsc("create_date"));
+
+        return list;
+    }
+
 }

src/main/java/com/aoyang/tms/service/impl/TmsLineCostServiceImpl.java

@@ -2,14 +2,11 @@ package com.aoyang.tms.service.impl;
 
 
 import com.alibaba.fastjson.JSON;
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.controller.param.TmsLineCostAddParam;
 import com.aoyang.tms.controller.vo.TmsLineCostDetail;
 import com.aoyang.tms.controller.vo.TmsLineCostListVO;
 import com.aoyang.tms.entity.TmsLineCost;
 import com.aoyang.tms.entity.TmsLineCostOther;
-import com.aoyang.tms.entity.TruckDept;
 import com.aoyang.tms.mapper.TmsLineCostMapper;
 import com.aoyang.tms.service.TmsLineCostOtherService;
 import com.aoyang.tms.service.TmsLineCostService;
@@ -22,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,7 +27,7 @@ import java.util.List;
  * 线路费用表 服务实现类
  * </p>
  *
- * @author liujiren
+ * @author chengang
  * @since 2022-04-23
  */
 @Service