WorkSpotController相关接口

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

@@ -1,16 +1,24 @@
 package com.aoyang.tms.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.TruckDept;
 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.WorkSpotService;
-import  com.aoyang.tms.entity.WorkSpot;
+
+import com.aoyang.tms.service.WorkSpotService;
+import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.common.result.Result;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,8 +28,8 @@ import com.aoyang.common.param.PageParam;
 
 /**
  * <p>
-    * 运单地点管理表 控制器
-    * </p>
+ * 运单地点管理表 控制器
+ * </p>
  *
  * @author guoyong
  * @since 2022-04-20
@@ -35,25 +43,71 @@ public class WorkSpotController {
     @Resource
     private WorkSpotService workSpotService;
 
-    @ApiOperation(value = "获取work_spot列表",notes="")
-    @PostMapping("/list")
+    @ApiOperation(value = "获取作业点分页列表", notes = "")
+    @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<WorkSpot> pageParam) {
-        Page<WorkSpot> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<WorkSpot> records = workSpotService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
+        log.info("获取运力部门管理分页列表,调用/tms/work_spot/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<>(workSpotService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改work_spot",notes="根据id修改work_spot")
+    @ApiOperation(value = "修改作业点", notes = "根据id修改work_spot")
     @PostMapping("/update")
-    public Result update(@RequestBody WorkSpot workSpot) {
-        Boolean flag = workSpotService.updateById(workSpot);
-        return new Result<>(flag);
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody WorkSpot param) {
+
+        log.info("修改作业点,调用/tms/work_spot/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getSpotId() == 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<>(workSpotService.updateById(param));
     }
 
-    @ApiOperation(value = "添加work_spot",notes="新增一条work_spot")
+    @ApiOperation(value = "添加作业点", notes = "新增一条work_spot")
     @PostMapping("/add")
-    public Result add(@RequestBody WorkSpot workSpot) {
-        Boolean flag = workSpotService.save(workSpot);
-        return new Result<>(flag);
+    public Result add(@RequestHeader(value = "userId") Long userId,
+                      @RequestHeader(value = "userName") String userName,
+                      @RequestBody WorkSpot param) {
+
+        log.info("添加作业点,调用/tms/work_spot/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null || param.getType() == null || param.getOrgName() == null
+                || param.getOrgShortName() == null || param.getSpotName() == 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<>(workSpotService.save(param));
+    }
+
+    @ApiOperation(value = "删除作业点", notes = "根据id删除作业点,参数：id")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody WorkSpot param) {
+        log.info("删除作业点,调用/tms/work_spot/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getSpotId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(workSpotService.removeById(param));
     }
 }

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

@@ -39,11 +39,24 @@ public class WorkSpot implements Serializable {
     @TableField("spot_name")
     private String spotName;
 
+    @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 = "具体地址")
     @TableField("adress")
     private String adress;
 
-    @ApiModelProperty(value = "1装车点、2卸车点、3检修点，不能为空")
+    @ApiModelProperty(value = "1装车点、2卸车点、3收车点，不能为空")
     @TableField("type")
     private Integer type;
 

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

@@ -1,6 +1,10 @@
 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.aoyang.tms.entity.WorkSpot;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WorkSpotService extends IService<WorkSpot> {
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取运力部门分页列表
+     * @Date 2022/4/21
+     * @Param
+     **/
+    IPage<WorkSpot> findPage(PageParam<WorkSpot> pageParam);
+
 }

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

@@ -1,11 +1,17 @@
 package com.aoyang.tms.service.impl;
 
+import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.tms.mapper.WorkSpotMapper;
 import com.aoyang.tms.service.WorkSpotService;
+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 java.util.List;
+
 /**
  * <p>
  * 运单地点管理表 服务实现类
@@ -17,4 +23,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class WorkSpotServiceImpl extends ServiceImpl<WorkSpotMapper, WorkSpot> implements WorkSpotService {
 
+    @Override
+    public IPage<WorkSpot> findPage(PageParam<WorkSpot> pageParam) {
+        Page<WorkSpot> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        QueryWrapper<WorkSpot> queryWrapper = new QueryWrapper<>();
+        if (pageParam.getParam().getOrgId() != null) {
+            queryWrapper.eq("org_id", pageParam.getParam().getOrgId());
+        }
+        if (pageParam.getParam().getType() != null) {
+            queryWrapper.eq("type", pageParam.getParam().getType());
+        }
+        if (pageParam.getParam().getSpotName() != null) {
+            queryWrapper.like("spot_name", pageParam.getParam().getSpotName());
+        }
+        IPage<WorkSpot> records = page(page, queryWrapper.orderByDesc("update_date"));
+        return records;
+    }
 }

src/main/resources/mapper/WorkSpotMapper.xml

@@ -6,6 +6,9 @@
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.WorkSpot">
         <id column="spot_id" property="spotId" />
         <result column="spot_name" property="spotName" />
+        <result column="org_id" property="orgId" />
+        <result column="org_name" property="orgName" />
+        <result column="org_short_name" property="orgShortName" />
         <result column="adress" property="adress" />
         <result column="type" property="type" />
         <result column="longitude" property="longitude" />
@@ -22,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        spot_id, spot_name, adress, type, longitude, latitude, valid_distance, note, creater, creater_name, create_date, updater, updater_name, update_date
+        spot_id, spot_name, org_id, org_name, org_short_name, adress, type, longitude, latitude, valid_distance, note, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>