Browse Source

开发集成地图前后端接口

master
wangxiang 3 years ago
parent
commit
caeb2c4f7e
  1. 4
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Hospital.java
  2. 10
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java
  3. 2
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java
  4. 7
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
  5. 71
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java
  6. 71
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java
  7. 4
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapLogisticMapper.java
  8. 4
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java
  9. 8
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java
  10. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticMapper.xml
  11. 1
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

4
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Hospital.java

@ -41,13 +41,13 @@ public class Hospital extends CommonEntity { @@ -41,13 +41,13 @@ public class Hospital extends CommonEntity {
private String payment;
private String addressIds;
private String regionIds;
private String detailAddress;
private String status;
private Integer mapOrientation;
private BigDecimal mapOrientation;
private BigDecimal mapLng;

10
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/LogisticMap.java → kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java

@ -2,11 +2,12 @@ package com.cloud.kicc.commonbiz.api.entity; @@ -2,11 +2,12 @@ package com.cloud.kicc.commonbiz.api.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.cloud.kicc.common.data.entity.CommonEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
@ -19,19 +20,18 @@ import lombok.experimental.Accessors; @@ -19,19 +20,18 @@ import lombok.experimental.Accessors;
* @author entfrm开发团队-王翔
* @since 2022-07-22
*/
@Getter
@Setter
@Data
@Accessors(chain = true)
@TableName("common_map")
@ApiModel(value = "Map对象", description = "地图核心主任务表")
public class LogisticMap extends CommonEntity {
public class MapLogistic extends CommonEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
private String id;
@ApiModelProperty("主线物流名称")
@ApiModelProperty("主线物流名称")
private String name;
@ApiModelProperty("收样员ID")

2
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java

@ -42,7 +42,7 @@ public class Org extends CommonEntity { @@ -42,7 +42,7 @@ public class Org extends CommonEntity {
private String status;
private Integer mapOrientation;
private BigDecimal mapOrientation;
private BigDecimal mapLng;

7
kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java

@ -9,6 +9,7 @@ import lombok.Data; @@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -99,10 +100,16 @@ public class User extends CommonEntity { @@ -99,10 +100,16 @@ public class User extends CommonEntity {
*/
private LocalDateTime loginTime;
/**
* 地图标记点位置图片旋转值
*/
private BigDecimal mapOrientation;
/**
* 帐号状态0正常 1停用
*/
private String status;
/**
* 角色ID集合
*/

71
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java

@ -1,71 +0,0 @@ @@ -1,71 +0,0 @@
package com.cloud.kicc.commonbiz.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.entity.LogisticMap;
import com.cloud.kicc.commonbiz.service.ILogisticMapService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
/**
* <p>
* 地图核心主任务表 前端控制器
* </p>
*
* @author entfrm开发团队-王翔
* @since 2022-07-22
*/
@RestController
@RequestMapping(AppConstants.APP_COMMON + "/logisticMap")
@RequiredArgsConstructor
public class LogisticMapController {
private final ILogisticMapService iLogisticMapService;
private LambdaQueryWrapper<LogisticMap> getQueryWrapper(LogisticMap logisticMap) {
return new LambdaQueryWrapper<LogisticMap>()
.eq(StrUtil.isNotBlank(logisticMap.getCourierUserId()), LogisticMap::getCourierUserId, logisticMap.getCourierUserId())
.eq(StrUtil.isNotBlank(logisticMap.getBatchCode()), LogisticMap::getBatchCode, logisticMap.getBatchCode())
.like(StrUtil.isNotBlank(logisticMap.getName()), LogisticMap::getName, logisticMap.getName())
.between(StrUtil.isAllNotBlank(logisticMap.getBeginTime(), logisticMap.getEndTime()), LogisticMap::getCreateTime, logisticMap.getBeginTime(), logisticMap.getEndTime());
}
@GetMapping("/list")
public R list(Page page, LogisticMap logisticMap) {
IPage<LogisticMap> iPage = iLogisticMapService.page(page, getQueryWrapper(logisticMap));
return R.ok(iPage.getRecords(), iPage.getTotal());
}
@GetMapping("/{id:\\w+}")
public R getById(@PathVariable("id") String id) {
LogisticMap logisticMap = iLogisticMapService.getById(id);
return R.ok(logisticMap);
}
@PostMapping("/save")
public R save(@RequestBody LogisticMap logisticMap) {
iLogisticMapService.save(logisticMap);
return R.ok();
}
@PutMapping("/update")
public R update(@RequestBody LogisticMap logisticMap) {
iLogisticMapService.updateById(logisticMap);
return R.ok();
}
@DeleteMapping("/remove/{ids:[\\w,]+}")
public R remove(@PathVariable String[] ids) {
iLogisticMapService.removeByIds(Arrays.asList(ids));
return R.ok();
}
}

71
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java

@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
package com.cloud.kicc.commonbiz.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
import com.cloud.kicc.commonbiz.service.IMapLogisticService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
/**
* <p>
* 地图核心主任务表 前端控制器
* </p>
*
* @author entfrm开发团队-王翔
* @since 2022-07-22
*/
@RestController
@RequestMapping(AppConstants.APP_COMMON + "/mapLogistic")
@RequiredArgsConstructor
public class MapLogisticController {
private final IMapLogisticService iMapLogisticService;
private LambdaQueryWrapper<MapLogistic> getQueryWrapper(MapLogistic mapLogistic) {
return new LambdaQueryWrapper<MapLogistic>()
.eq(StrUtil.isNotBlank(mapLogistic.getCourierUserId()), MapLogistic::getCourierUserId, mapLogistic.getCourierUserId())
.eq(StrUtil.isNotBlank(mapLogistic.getBatchCode()), MapLogistic::getBatchCode, mapLogistic.getBatchCode())
.like(StrUtil.isNotBlank(mapLogistic.getName()), MapLogistic::getName, mapLogistic.getName())
.between(StrUtil.isAllNotBlank(mapLogistic.getBeginTime(), mapLogistic.getEndTime()), MapLogistic::getCreateTime, mapLogistic.getBeginTime(), mapLogistic.getEndTime());
}
@GetMapping("/list")
public R list(Page page, MapLogistic mapLogistic) {
IPage<MapLogistic> iPage = iMapLogisticService.page(page, getQueryWrapper(mapLogistic));
return R.ok(iPage.getRecords(), iPage.getTotal());
}
@GetMapping("/{id:\\w+}")
public R getById(@PathVariable("id") String id) {
MapLogistic mapLogistic = iMapLogisticService.getById(id);
return R.ok(mapLogistic);
}
@PostMapping("/save")
public R save(@RequestBody MapLogistic mapLogistic) {
iMapLogisticService.save(mapLogistic);
return R.ok();
}
@PutMapping("/update")
public R update(@RequestBody MapLogistic mapLogistic) {
iMapLogisticService.updateById(mapLogistic);
return R.ok();
}
@DeleteMapping("/remove/{ids:[\\w,]+}")
public R remove(@PathVariable String[] ids) {
iMapLogisticService.removeByIds(Arrays.asList(ids));
return R.ok();
}
}

4
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/LogisticMapMapper.java → kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapLogisticMapper.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package com.cloud.kicc.commonbiz.mapper;
import com.cloud.kicc.commonbiz.api.entity.LogisticMap;
import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author entfrm开发团队-王翔
* @since 2022-07-22
*/
public interface LogisticMapMapper extends BaseMapper<LogisticMap> {
public interface MapLogisticMapper extends BaseMapper<MapLogistic> {
}

4
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/ILogisticMapService.java → kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package com.cloud.kicc.commonbiz.service;
import com.cloud.kicc.commonbiz.api.entity.LogisticMap;
import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService; @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @author entfrm开发团队-王翔
* @since 2022-07-22
*/
public interface ILogisticMapService extends IService<LogisticMap> {
public interface IMapLogisticService extends IService<MapLogistic> {
}

8
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/LogisticMapServiceImpl.java → kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package com.cloud.kicc.commonbiz.service.impl;
import com.cloud.kicc.commonbiz.api.entity.LogisticMap;
import com.cloud.kicc.commonbiz.mapper.LogisticMapMapper;
import com.cloud.kicc.commonbiz.service.ILogisticMapService;
import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
import com.cloud.kicc.commonbiz.mapper.MapLogisticMapper;
import com.cloud.kicc.commonbiz.service.IMapLogisticService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
* @since 2022-07-22
*/
@Service
public class LogisticMapServiceImpl extends ServiceImpl<LogisticMapMapper, LogisticMap> implements ILogisticMapService {
public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLogistic> implements IMapLogisticService {
}

2
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/LogisticMapMapper.xml → kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticMapper.xml

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cloud.kicc.commonbiz.mapper.LogisticMapMapper">
<mapper namespace="com.cloud.kicc.commonbiz.mapper.MapLogisticMapper">
</mapper>

1
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
<result property="avatar" column="avatar"/>
<result property="email" column="email"/>
<result property="deptId" column="dept_id"/>
<result property="mapOrientation" column="map_orientation"/>
<result property="deptName" column="dept_name"/>
<result property="loginIp" column="login_ip"/>
<result property="loginTime" column="login_time"/>

Loading…
Cancel
Save