ShipperController相关接口

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

@@ -1,12 +1,18 @@
 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.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
 import java.util.*;
 import javax.annotation.Resource;
 import  com.aoyang.tms.service.ShipperService;
@@ -35,25 +41,61 @@ public class ShipperController {
     @Resource
     private ShipperService shipperService;
 
-    @ApiOperation(value = "获取shipper列表",notes="")
-    @PostMapping("/list")
+    @ApiOperation(value = "获取托运方分页列表",notes="必传参数:orgId")
+    @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<Shipper> pageParam) {
-        Page<Shipper> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<Shipper> records = shipperService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
+        log.info("获取托运方分页列表,调用/tms/shipper/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<>(shipperService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改shipper",notes="根据id修改shipper")
+    @ApiOperation(value = "修改托运方",notes="必传参数:shipperId")
     @PostMapping("/update")
-    public Result update(@RequestBody Shipper shipper) {
-        Boolean flag = shipperService.updateById(shipper);
-        return new Result<>(flag);
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody Shipper param) {
+
+        log.info("修改托运方,调用/tms/shipper/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getShipperId() == 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<>(shipperService.updateById(param));
     }
 
-    @ApiOperation(value = "添加shipper",notes="新增一条shipper")
+    @ApiOperation(value = "添加托运方",notes="必传参数:orgId,orgName,orgShortName,shipperName")
     @PostMapping("/add")
-    public Result add(@RequestBody Shipper shipper) {
-        Boolean flag = shipperService.save(shipper);
-        return new Result<>(flag);
+    public Result add(@RequestHeader(value = "userId") Long userId,
+                      @RequestHeader(value = "userName") String userName,
+                      @RequestBody Shipper param) {
+
+        log.info("添加托运方,调用/tms/shipper/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null || param.getOrgName() == null
+                || param.getOrgShortName() == null || param.getShipperName() == 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());
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(shipperService.save(param));
     }
 }

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

@@ -45,7 +45,7 @@ public class TruckDeptController {
     @Resource
     private CommonService commonService;
 
-    @ApiOperation(value = "获取运力部门管理分页列表", notes = "")
+    @ApiOperation(value = "获取运力部门管理分页列表", notes = "必传参数:orgId")
     @PostMapping("/page_list")
     public Result pageList(@RequestBody PageParam<TruckDept> pageParam) {
         log.info("获取运力部门管理分页列表,调用/tms/truck_dept/page_list,参数:{}", JSON.toJSONString(pageParam));
@@ -55,7 +55,7 @@ public class TruckDeptController {
         return new Result<>(truckDeptService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改运力部门信息", notes = "根据id修改truck_dept")
+    @ApiOperation(value = "修改运力部门信息", notes = "必传参数:id")
     @PostMapping("/update")
     public Result update(@RequestHeader(value = "userId") Long userId,
                          @RequestHeader(value = "userName") String userName,
@@ -76,7 +76,7 @@ public class TruckDeptController {
         return new Result<>(truckDeptService.updateById(param));
     }
 
-    @ApiOperation(value = "新增运力部门", notes = "新增一条truck_dept")
+    @ApiOperation(value = "新增运力部门", notes = "必传参数:name,orgId,orgName,orgShortName")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,
@@ -101,7 +101,7 @@ public class TruckDeptController {
         return new Result<>(truckDeptService.save(param));
     }
 
-    @ApiOperation(value = "删除运力部门", notes = "根据id删除运力部门,参数：id")
+    @ApiOperation(value = "删除运力部门", notes = "根据id删除运力部门,参数：id,orgId")
     @PostMapping("/delete")
     public Result delete(@RequestBody TruckDept param) {
         log.info("删除运力部门,调用/tms/truck_dept/delete,参数:{}", JSON.toJSONString(param));

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

@@ -43,7 +43,7 @@ public class WorkSpotController {
     @Resource
     private WorkSpotService workSpotService;
 
-    @ApiOperation(value = "获取作业点分页列表", notes = "")
+    @ApiOperation(value = "获取作业点分页列表", notes = "必传参数:orgId")
     @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<WorkSpot> pageParam) {
         log.info("获取运力部门管理分页列表,调用/tms/work_spot/page_list,参数:{}", JSON.toJSONString(pageParam));
@@ -53,7 +53,7 @@ public class WorkSpotController {
         return new Result<>(workSpotService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改作业点", notes = "根据id修改work_spot")
+    @ApiOperation(value = "修改作业点", notes = "根据id修改work_spot,spotId")
     @PostMapping("/update")
     public Result update(@RequestHeader(value = "userId") Long userId,
                          @RequestHeader(value = "userName") String userName,
@@ -75,7 +75,7 @@ public class WorkSpotController {
         return new Result<>(workSpotService.updateById(param));
     }
 
-    @ApiOperation(value = "添加作业点", notes = "新增一条work_spot")
+    @ApiOperation(value = "添加作业点", notes = "必传参数:orgId,type,orgName,orgShortName,spotName")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,

src/main/java/com/aoyang/tms/entity/Shipper.java

@@ -46,6 +46,19 @@ public class Shipper implements Serializable {
     @TableField("url")
     private String url;
 
+    @ApiModelProperty(value = "物流公司id")
+    @TableField("org_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
+    @ApiModelProperty(value = "物流公司名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "物流公司简称")
+    @TableField("org_short_name")
+    private String orgShortName;
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -59,5 +72,18 @@ public class Shipper implements Serializable {
     @TableField("create_date")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
 
 }

src/main/java/com/aoyang/tms/entity/TruckDept.java

@@ -39,16 +39,16 @@ public class TruckDept implements Serializable {
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "组织id")
+    @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orgId;
 
-    @ApiModelProperty(value = "组织名称")
+    @ApiModelProperty(value = "物流公司名称")
     @TableField("org_name")
     private String orgName;
 
-    @ApiModelProperty(value = "组织简称")
+    @ApiModelProperty(value = "物流公司简称")
     @TableField("org_short_name")
     private String orgShortName;
 

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

@@ -1,6 +1,9 @@
 package com.aoyang.tms.service;
 
+import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.entity.Shipper;
+import com.aoyang.tms.entity.WorkSpot;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +16,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ShipperService extends IService<Shipper> {
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取托运方分页列表
+     * @Date 2022/4/21
+     * @Param
+     **/
+    IPage<Shipper> findPage(PageParam<Shipper> pageParam);
+
 }

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

@@ -1,8 +1,13 @@
 package com.aoyang.tms.service.impl;
 
+import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.entity.Shipper;
+import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.tms.mapper.ShipperMapper;
 import com.aoyang.tms.service.ShipperService;
+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;
 
@@ -17,4 +22,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class ShipperServiceImpl extends ServiceImpl<ShipperMapper, Shipper> implements ShipperService {
 
+
+    @Override
+    public IPage<Shipper> findPage(PageParam<Shipper> pageParam) {
+        Page<Shipper> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        QueryWrapper<Shipper> queryWrapper = new QueryWrapper<>();
+        if (pageParam.getParam().getShipperName() != null) {
+            queryWrapper.like("shipper_name", pageParam.getParam().getShipperName());
+        }
+        IPage<Shipper> records = page(page, queryWrapper.orderByDesc("update_date"));
+        return records;
+    }
 }

src/main/resources/mapper/ShipperMapper.xml

@@ -8,14 +8,20 @@
         <result column="shipper_name" property="shipperName" />
         <result column="short_name" property="shortName" />
         <result column="url" property="url" />
+        <result column="org_id" property="orgId" />
+        <result column="org_name" property="orgName" />
+        <result column="org_short_name" property="orgShortName" />
         <result column="creater" property="creater" />
         <result column="creater_name" property="createrName" />
         <result column="create_date" property="createDate" />
+        <result column="updater" property="updater" />
+        <result column="updater_name" property="updaterName" />
+        <result column="update_date" property="updateDate" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        shipper_id, shipper_name, short_name, url, creater, creater_name, create_date
+        shipper_id, shipper_name, short_name, url, org_id, org_name, org_short_name, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>