Merge remote-tracking branch 'origin/master'

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

@@ -1,16 +1,20 @@
 package com.aoyang.tms.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
 import org.springframework.web.bind.annotation.*;
 
 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 javax.annotation.Resource;
-import  com.aoyang.tms.service.TruckDeptService;
-import  com.aoyang.tms.entity.TruckDept;
+
+import com.aoyang.tms.service.TruckDeptService;
+import com.aoyang.tms.entity.TruckDept;
 import com.aoyang.common.result.Result;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,8 +24,8 @@ import com.aoyang.common.param.PageParam;
 
 /**
  * <p>
-    * 运力部门管理表 控制器
-    * </p>
+ * 运力部门管理表 控制器
+ * </p>
  *
  * @author guoyong
  * @since 2022-04-20
@@ -35,25 +39,31 @@ public class TruckDeptController {
     @Resource
     private TruckDeptService truckDeptService;
 
-    @ApiOperation(value = "获取truck_dept列表",notes="")
-    @PostMapping("/list")
-    public Result list(@RequestBody PageParam<TruckDept> pageParam) {
-        Page<TruckDept> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<TruckDept> records = truckDeptService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
+    @ApiOperation(value = "获取运力部门管理分页列表", notes = "")
+    @PostMapping("/page_list")
+    public Result pageList(@RequestBody PageParam<TruckDept> pageParam) {
+        log.info("获取运力部门管理分页列表,调用/tms/truck_dept/page_list,参数:{}", JSON.toJSONString(pageParam));
+        if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getOrgId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(truckDeptService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改truck_dept",notes="根据id修改truck_dept")
+    @ApiOperation(value = "修改truck_dept", notes = "根据id修改truck_dept")
     @PostMapping("/update")
     public Result update(@RequestBody TruckDept truckDept) {
         Boolean flag = truckDeptService.updateById(truckDept);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加truck_dept",notes="新增一条truck_dept")
+    @ApiOperation(value = "新增运力部门", notes = "新增一条truck_dept")
     @PostMapping("/add")
-    public Result add(@RequestBody TruckDept truckDept) {
-        Boolean flag = truckDeptService.save(truckDept);
+    public Result add(@RequestBody TruckDept param) {
+        log.info("新增运力部门,调用/tms/truck_dept/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null || param.getName() == null || param.getOrgName() == null || param.getOrgShortName() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = truckDeptService.save(param);
         return new Result<>(flag);
     }
 }

src/main/java/com/aoyang/tms/controller/vo/TruckDeptListVO.java

@@ -0,0 +1,32 @@
+package com.aoyang.tms.controller.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TruckDeptListVO {
+
+    @ApiModelProperty(value = "运力部门id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckDeptId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String name;
+
+    @ApiModelProperty(value = "分管运力")
+    private Integer truckNum;
+
+    @ApiModelProperty(value = "修改人id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    private LocalDateTime updateDate;
+
+}

src/main/java/com/aoyang/tms/feign/StrategyFeignClient.java

@@ -21,11 +21,11 @@ import java.util.List;
 public interface StrategyFeignClient {
 
     /**
+     * @return
      * @Author guoyong
      * @Description 根据name获取系统配置值
      * @Date 2021/8/31
      * @Param
-     * @return
      **/
     @PostMapping("/strategy/system_config/get_by_Name")
     Result<SystemConfig> getSystemConfigByName(@RequestBody SystemConfig systemConfigParam);
@@ -50,4 +50,15 @@ public interface StrategyFeignClient {
     @PostMapping("/strategy/truck_driver/find_truck_drivers")
     Result<List<TruckDriver>> findTruckDrivers(@RequestBody TruckDriver truckDriver);
 
+    /**
+     * 获取物流公司下卡车数量或者物流公司下部门卡车数量
+     *
+     * @param truck
+     * @return
+     */
+
+    @PostMapping("/strategy/truck/find_org_truck_number")
+    Result<Integer> findOrgTruckNumber(@RequestBody Truck truck);
+
+
 }

src/main/java/com/aoyang/tms/feign/fallback/StrategyFeignClientFallback.java

@@ -9,6 +9,7 @@ import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -45,6 +46,11 @@ public class StrategyFeignClientFallback implements FallbackFactory<StrategyFeig
                 return new Result<>(4000, "Strategy熔断", null);
             }
 
+            @Override
+            public  Result<Integer> findOrgTruckNumber(Truck truck) {
+                return new Result<>(4000, "Strategy熔断", null);
+            }
+
         };
     }
 }

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

@@ -38,7 +38,7 @@ public interface CommonService {
      * @param
      * @return
      */
-    Integer findOrgTruckNumber(Long orgId,Long deptId);
+    Integer findOrgTruckNumber(Long orgId, Long deptId);
 
 
     /**

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

@@ -1,6 +1,9 @@
 package com.aoyang.tms.service;
 
+import com.aoyang.common.param.PageParam;
+import com.aoyang.tms.controller.vo.TruckDeptListVO;
 import com.aoyang.tms.entity.TruckDept;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +16,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface TruckDeptService extends IService<TruckDept> {
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取运力部门分页列表
+     * @Date 2021/11/9
+     * @Param
+     **/
+    IPage<TruckDeptListVO> findPage(PageParam<TruckDept> pageParam);
+
+
 }

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

@@ -68,6 +68,10 @@ public class CommonServiceImpl implements CommonService {
         if (deptId != null) {
             truck.setDeptId(deptId);
         }
+        Result<Integer> result = strategyFeignClient.findOrgTruckNumber(truck);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
         return null;
     }
 
@@ -89,8 +93,8 @@ public class CommonServiceImpl implements CommonService {
         query.with(new Sort(Sort.Direction.DESC, "createTime"));
         TmsMongoDoc tmsMongoDoc = mongoTemplate.findOne(query, TmsMongoDoc.class);
         LocationVO location = new LocationVO();
-        location.setLatitude(tmsMongoDoc.getLatitude()+"");
-        location.setLongitude(tmsMongoDoc.getLongitude()+"");
+        location.setLatitude(tmsMongoDoc.getLatitude() + "");
+        location.setLongitude(tmsMongoDoc.getLongitude() + "");
         location.setCarNumber(truckSimCard.getCarNumber());
         location.setTruckId(truckSimCard.getTruckId());
         location.setLocalTime("20" + tmsMongoDoc.getDateTime());

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

@@ -1,11 +1,21 @@
 package com.aoyang.tms.service.impl;
 
+import com.aoyang.common.param.PageParam;
+import com.aoyang.tms.controller.vo.TruckDeptListVO;
 import com.aoyang.tms.entity.TruckDept;
 import com.aoyang.tms.mapper.TruckDeptMapper;
+import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.TruckDeptService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 运力部门管理表 服务实现类
@@ -17,4 +27,38 @@ import org.springframework.stereotype.Service;
 @Service
 public class TruckDeptServiceImpl extends ServiceImpl<TruckDeptMapper, TruckDept> implements TruckDeptService {
 
+    @Resource
+    private CommonService commonService;
+
+    @Override
+    public IPage<TruckDeptListVO> findPage(PageParam<TruckDept> pageParam) {
+        IPage<TruckDeptListVO> truckDeptListVOIPage = new Page<>();
+        Page<TruckDept> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        QueryWrapper<TruckDept> queryWrapper = new QueryWrapper<>();
+        if (pageParam.getParam().getOrgId() != null) {
+            queryWrapper.eq("org_id", pageParam.getParam().getOrgId());
+        }
+        if (pageParam.getParam().getName() != null) {
+            queryWrapper.like("name", pageParam.getParam().getName());
+        }
+        IPage<TruckDept> records = page(page, queryWrapper.orderByDesc("update_date"));
+        List<TruckDept> list = records.getRecords();
+        List<TruckDeptListVO> listVo = new ArrayList<>();
+        for (TruckDept truckDept : list) {
+            TruckDeptListVO truckDeptListVO = new TruckDeptListVO();
+            truckDeptListVO.setTruckDeptId(truckDept.getId());
+            truckDeptListVO.setName(truckDept.getName());
+            truckDeptListVO.setUpdater(truckDept.getUpdater());
+            truckDeptListVO.setUpdateDate(truckDept.getUpdateDate());
+            truckDeptListVO.setUpdaterName(truckDept.getUpdaterName());
+            truckDeptListVO.setTruckNum(commonService.findOrgTruckNumber(truckDept.getOrgId(), truckDept.getId()));
+
+            listVo.add(truckDeptListVO);
+        }
+        truckDeptListVOIPage.setRecords(listVo);
+        truckDeptListVOIPage.setTotal(records.getTotal());
+        truckDeptListVOIPage.setPages(records.getPages());
+        truckDeptListVOIPage.setCurrent(records.getCurrent());
+        return truckDeptListVOIPage;
+    }
 }