Browse Source

🚀 完成地图接口

master
wangxiang 3 years ago
parent
commit
52332423ee
  1. 12
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java
  2. 3
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java
  3. 6
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java
  4. 6
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java
  5. 41
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/MapTaskStatusEnum.java
  6. 22
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java
  7. 39
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java
  8. 8
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java
  9. 16
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapTaskService.java
  10. 24
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java
  11. 52
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java
  12. 72
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/PushClientUtil.java
  13. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
  14. 15
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java
  15. 6
      kicc-register/src/main/resources/bootstrap.yml

12
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java

@ -61,18 +61,6 @@ public class MapLogistic extends CommonEntity {
@ApiModelProperty("发单起点纬度值") @ApiModelProperty("发单起点纬度值")
private Double sendOrderLat; private Double sendOrderLat;
@ApiModelProperty("客服上传做项目原始单文件ID")
private String fileId;
@ApiModelProperty("预计时间")
private LocalDateTime estimateTime;
@ApiModelProperty("要求时间")
private LocalDateTime requireTime;
@ApiModelProperty("关联报告单生成的批次码")
private String batchCode;
@Version @Version
@ApiModelProperty("版本控制") @ApiModelProperty("版本控制")
private Integer version; private Integer version;

3
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java

@ -61,6 +61,9 @@ public class MapLogisticPoint extends CommonEntity {
@ApiModelProperty("地图任务ID") @ApiModelProperty("地图任务ID")
private String mapTaskId; private String mapTaskId;
@ApiModelProperty("任务状态")
private String status;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty("表格操作key") @ApiModelProperty("表格操作key")
private String key; private String key;

6
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java

@ -70,6 +70,9 @@ public class MapTask extends CommonEntity {
@ApiModelProperty("文件id") @ApiModelProperty("文件id")
private String fileId; private String fileId;
@ApiModelProperty("单据文件id")
private String receiptFileId;
@ApiModelProperty("预计时间") @ApiModelProperty("预计时间")
private LocalDateTime estimateTime; private LocalDateTime estimateTime;
@ -82,6 +85,9 @@ public class MapTask extends CommonEntity {
@ApiModelProperty("地图主线物流ID") @ApiModelProperty("地图主线物流ID")
private String mapLogisticId; private String mapLogisticId;
@ApiModelProperty("任务状态")
private String status;
@Version @Version
@ApiModelProperty("版本控制") @ApiModelProperty("版本控制")
private Integer version; private Integer version;

6
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java

@ -66,6 +66,9 @@ public class MapTaskPreset extends CommonEntity {
@ApiModelProperty("文件id") @ApiModelProperty("文件id")
private String fileId; private String fileId;
@ApiModelProperty("单据文件id")
private String receiptFileId;
@ApiModelProperty("预计时间") @ApiModelProperty("预计时间")
private LocalDateTime estimateTime; private LocalDateTime estimateTime;
@ -81,6 +84,9 @@ public class MapTaskPreset extends CommonEntity {
@ApiModelProperty("地图任务ID") @ApiModelProperty("地图任务ID")
private String mapTaskId; private String mapTaskId;
@ApiModelProperty("任务状态")
private String status;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty("表格操作key") @ApiModelProperty("表格操作key")
private String key; private String key;

41
kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/MapTaskStatusEnum.java

@ -0,0 +1,41 @@
package com.cloud.kicc.commonbiz.api.enums;
/**
*<p>
* 地图任务状态枚举
*</p>
*
* @Author: entfrm开发团队-王翔
* @since: 2022/11/15
*/
public enum MapTaskStatusEnum {
RUNNING("0","正在运行中"),
END("9","结束");
private String status;
private String description;
MapTaskStatusEnum(String status, String description) {
this.status = status;
this.description = description;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
}

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

@ -1,5 +1,5 @@
package com.cloud.kicc.commonbiz.controller; package com.cloud.kicc.commonbiz.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -7,14 +7,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.common.security.util.SecurityUtils;
import com.cloud.kicc.commonbiz.api.entity.MapLogistic; import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint; import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.cloud.kicc.commonbiz.api.entity.MapTask; import com.cloud.kicc.commonbiz.api.entity.MapTask;
import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset; import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset;
import com.cloud.kicc.commonbiz.service.IMapLogisticPointService; import com.cloud.kicc.commonbiz.service.*;
import com.cloud.kicc.commonbiz.service.IMapLogisticService;
import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
import com.cloud.kicc.commonbiz.service.IMapTaskService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -42,11 +40,11 @@ public class MapLogisticController {
private final IMapTaskService iMapTaskService; private final IMapTaskService iMapTaskService;
private final IMapTaskPresetService iMapTaskPresetService; private final IMapTaskPresetService iMapTaskPresetService;
private final IMapLogisticPointService iMapLogisticPointService; private final IMapLogisticPointService iMapLogisticPointService;
private final IMapLogisticSseService iMapLogisticSseService;
private LambdaQueryWrapper<MapLogistic> getQueryWrapper(MapLogistic mapLogistic) { private LambdaQueryWrapper<MapLogistic> getQueryWrapper(MapLogistic mapLogistic) {
return new LambdaQueryWrapper<MapLogistic>() return new LambdaQueryWrapper<MapLogistic>()
.eq(StrUtil.isNotBlank(mapLogistic.getCourierUserId()), MapLogistic::getCourierUserId, mapLogistic.getCourierUserId()) .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()) .like(StrUtil.isNotBlank(mapLogistic.getName()), MapLogistic::getName, mapLogistic.getName())
.between(StrUtil.isAllNotBlank(mapLogistic.getBeginTime(), mapLogistic.getEndTime()), MapLogistic::getCreateTime, mapLogistic.getBeginTime(), mapLogistic.getEndTime()); .between(StrUtil.isAllNotBlank(mapLogistic.getBeginTime(), mapLogistic.getEndTime()), MapLogistic::getCreateTime, mapLogistic.getBeginTime(), mapLogistic.getEndTime());
} }
@ -100,8 +98,16 @@ public class MapLogisticController {
@PostMapping("/uploadGps") @PostMapping("/uploadGps")
@ApiOperation(value = "安卓定时上传GPS定位") @ApiOperation(value = "安卓定时上传GPS定位")
public R uploadGps(@RequestBody MapLogistic mapLogistic) { public R uploadGps(@RequestBody MapLogistic mapLogistic) {
System.out.println("当前安卓GPS定位为: 经度值:"+ mapLogistic.getCourierLng() + "||纬度值:" + mapLogistic.getCourierLat() + "||收样员id:" + mapLogistic.getCourierUserId() + "||收样员名称:" + mapLogistic.getCourierUserName()); iMapLogisticSseService.sendMessage(SecurityUtils.getUser().getId(),item -> {
return R.ok("当前安卓GPS定位为: 经度值:"+ mapLogistic.getCourierLng() + "||纬度值:" + mapLogistic.getCourierLat() + "||收样员id:" + mapLogistic.getCourierUserId() + "||收样员名称:" + mapLogistic.getCourierUserName()); item.getSseEmitter().send(mapLogistic);
});
return R.ok(mapLogistic);
}
@PostMapping("/pushAndroidMsg")
public R pushAndroidMsg() {
iMapLogisticService.pushAndroidMsg();
return R.ok();
} }
} }

39
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java

@ -1,13 +1,20 @@
package com.cloud.kicc.commonbiz.controller; package com.cloud.kicc.commonbiz.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.common.security.util.SecurityUtils;
import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.cloud.kicc.commonbiz.api.entity.MapTask; import com.cloud.kicc.commonbiz.api.entity.MapTask;
import com.cloud.kicc.commonbiz.api.entity.Message;
import com.cloud.kicc.commonbiz.api.enums.MapTaskStatusEnum;
import com.cloud.kicc.commonbiz.service.IMapTaskService; import com.cloud.kicc.commonbiz.service.IMapTaskService;
import com.cloud.kicc.commonbiz.service.IMessageService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -30,6 +37,7 @@ import java.util.Arrays;
public class MapTaskController { public class MapTaskController {
private final IMapTaskService iMapTaskService; private final IMapTaskService iMapTaskService;
private final IMessageService iMessageService;
private LambdaQueryWrapper<MapTask> getQueryWrapper(MapTask mapTask) { private LambdaQueryWrapper<MapTask> getQueryWrapper(MapTask mapTask) {
return new LambdaQueryWrapper<MapTask>() return new LambdaQueryWrapper<MapTask>()
@ -72,5 +80,36 @@ public class MapTaskController {
return R.ok(); return R.ok();
} }
@PutMapping("/destinationUpdateMapTaskStatus")
@ApiOperation(value = "地图任务状态修改", notes = "到达目的地地图任务修改")
public R destinationUpdateMapTaskStatus(@RequestBody MapTask mapTask) {
mapTask.setStatus(MapTaskStatusEnum.RUNNING.getStatus());
iMapTaskService.destinationUpdateMapTaskStatus(mapTask);
return R.ok();
}
@PutMapping("/setPresetPoint")
@ApiOperation(value = "设置预设点")
public R setPresetPoint(@RequestBody MapLogisticPoint mapLogisticPoint) {
String content = JSONObject.toJSONString(mapLogisticPoint);
// 保存交接消息
iMessageService.save(new Message()
.setName(SecurityUtils.getUser().getUsername() + "与你对接预设点")
.setContent(content));
// todo: 调用友盟推送接口,目前未测试需要安卓上线平台,后面处理
return R.ok();
}
@PutMapping("/confirmPresetPoint")
@ApiOperation(value = "确认预设点")
public R confirmPresetPoint(@RequestBody Message message) {
if (!JSONUtil.isJson(message.getContent())) return R.error("当前消息体内不是json数据,请检查后重试!");
MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(message.getContent(), MapLogisticPoint.class);
iMapTaskService.confirmPresetPoint(mapLogisticPoint);
iMessageService.removeById(message.getId());
return R.ok();
}
} }

8
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java

@ -28,4 +28,12 @@ public interface IMapLogisticService extends IService<MapLogistic> {
*/ */
void mapRemove(List<String> mapLogisticIds); void mapRemove(List<String> mapLogisticIds);
/**
* 友盟推送消息
* @param
* @return
*/
void pushAndroidMsg();
} }

16
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapTaskService.java

@ -1,5 +1,6 @@
package com.cloud.kicc.commonbiz.service; package com.cloud.kicc.commonbiz.service;
import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.cloud.kicc.commonbiz.api.entity.MapTask; import com.cloud.kicc.commonbiz.api.entity.MapTask;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
@ -13,4 +14,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/ */
public interface IMapTaskService extends IService<MapTask> { public interface IMapTaskService extends IService<MapTask> {
/**
* 到达目的地
* 更新地图任务状态
* @param mapTask 地图任务
* @return boolean
*/
boolean destinationUpdateMapTaskStatus(MapTask mapTask);
/**
* 确认预设点
* @param mapLogisticPoint 地图点
* @return boolean
*/
boolean confirmPresetPoint(MapLogisticPoint mapLogisticPoint);
} }

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

@ -3,6 +3,7 @@ package com.cloud.kicc.commonbiz.service.impl;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.entity.MapLogistic; import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
@ -14,7 +15,9 @@ import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
import com.cloud.kicc.commonbiz.service.IMapLogisticService; import com.cloud.kicc.commonbiz.service.IMapLogisticService;
import com.cloud.kicc.commonbiz.service.IMapTaskPresetService; import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
import com.cloud.kicc.commonbiz.service.IMapTaskService; import com.cloud.kicc.commonbiz.service.IMapTaskService;
import com.cloud.kicc.commonbiz.util.PushClientUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import okhttp3.OkHttpClient;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -36,6 +39,7 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
private final IMapTaskService iMapTaskService; private final IMapTaskService iMapTaskService;
private final IMapTaskPresetService iMapTaskPresetService; private final IMapTaskPresetService iMapTaskPresetService;
private final IMapLogisticPointService iMapLogisticPointService; private final IMapLogisticPointService iMapLogisticPointService;
private final OkHttpClient okHttpClient;
@Override @Override
public void mapSaveOrUpdate(MapLogistic mapLogistic) { public void mapSaveOrUpdate(MapLogistic mapLogistic) {
@ -96,4 +100,24 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
}); });
} }
@Override
public void pushAndroidMsg() {
JSONObject jsonObject = new JSONObject();
jsonObject.put("appkey", "6373815dac36474270fdf0c1");
jsonObject.put("type", "unicast");
jsonObject.put("production_mode", "false");
JSONObject payload = new JSONObject();
payload.put("display_type", "message");
JSONObject body = new JSONObject();
body.put("custom", "测试发送消息!");
payload.put("body", body);
jsonObject.put("payload", payload);
try {
PushClientUtil pushClientUtil = new PushClientUtil(okHttpClient);
pushClientUtil.send(jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
}
} }

52
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java

@ -1,10 +1,17 @@
package com.cloud.kicc.commonbiz.service.impl; package com.cloud.kicc.commonbiz.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.cloud.kicc.commonbiz.api.entity.MapTask; import com.cloud.kicc.commonbiz.api.entity.MapTask;
import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset;
import com.cloud.kicc.commonbiz.mapper.MapTaskMapper; import com.cloud.kicc.commonbiz.mapper.MapTaskMapper;
import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
import com.cloud.kicc.commonbiz.service.IMapTaskService; import com.cloud.kicc.commonbiz.service.IMapTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/** /**
* <p> * <p>
@ -15,6 +22,51 @@ import org.springframework.stereotype.Service;
* @since 2022-08-29 * @since 2022-08-29
*/ */
@Service @Service
@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class MapTaskServiceImpl extends ServiceImpl<MapTaskMapper, MapTask> implements IMapTaskService { public class MapTaskServiceImpl extends ServiceImpl<MapTaskMapper, MapTask> implements IMapTaskService {
private final IMapTaskPresetService iMapTaskPresetService;
private final IMapLogisticPointService iMapLogisticPointService;
@Override
public boolean destinationUpdateMapTaskStatus(MapTask mapTask) {
super.update(new MapTask().setStatus(mapTask.getStatus()), Wrappers.<MapTask>lambdaUpdate().eq(MapTask::getId, mapTask.getId()));
iMapTaskPresetService.update(new MapTaskPreset().setStatus(mapTask.getStatus()), Wrappers.<MapTaskPreset>lambdaUpdate().eq(MapTaskPreset::getId, mapTask.getId()));
iMapLogisticPointService.update(new MapLogisticPoint().setStatus(mapTask.getStatus()), Wrappers.<MapLogisticPoint>lambdaUpdate()
.eq(MapLogisticPoint::getMapTaskId, mapTask.getId())
.eq(MapLogisticPoint::getType, mapTask.getTaskType()));
return true;
}
@Override
public boolean confirmPresetPoint(MapLogisticPoint mapLogisticPoint) {
MapTask mapTask = new MapTask();
MapTaskPreset mapTaskPreset = new MapTaskPreset();
if (mapLogisticPoint.getType().equals("1")) {
mapTask.setOrgName(mapLogisticPoint.getHospitalName());
mapTask.setOrgLat(mapLogisticPoint.getLat());
mapTask.setOrgLng(mapLogisticPoint.getLng());
mapTaskPreset.setDestinationPresetName(mapLogisticPoint.getHospitalName());
mapTaskPreset.setDestinationPresetLat(mapLogisticPoint.getLat());
mapTaskPreset.setDestinationPresetLng(mapLogisticPoint.getLng());
} else {
mapTask.setHospitalName(mapLogisticPoint.getHospitalName());
mapTask.setHospitalLat(mapLogisticPoint.getLat());
mapTask.setHospitalLng(mapLogisticPoint.getLng());
mapTaskPreset.setOrginPresetName(mapLogisticPoint.getHospitalName());
mapTaskPreset.setOrginPresetLat(mapLogisticPoint.getLat());
mapTaskPreset.setOrginPresetLng(mapLogisticPoint.getLng());
}
super.update(mapTask, Wrappers.<MapTask>lambdaUpdate().eq(MapTask::getId, mapLogisticPoint.getMapTaskId()));
iMapTaskPresetService.update(mapTaskPreset, Wrappers.<MapTaskPreset>lambdaUpdate().eq(MapTaskPreset::getId, mapLogisticPoint.getId()));
iMapLogisticPointService.update(new MapLogisticPoint()
.setHospitalName(mapLogisticPoint.getHospitalName())
.setLng(mapLogisticPoint.getLng())
.setLat(mapLogisticPoint.getLat()), Wrappers.<MapLogisticPoint>lambdaUpdate()
.eq(MapLogisticPoint::getMapTaskId, mapLogisticPoint.getId())
.eq(MapLogisticPoint::getTaskType,"2")
.eq(MapLogisticPoint::getType, mapLogisticPoint.getTaskType()));
return true;
}
} }

72
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/PushClientUtil.java

@ -0,0 +1,72 @@
package com.cloud.kicc.commonbiz.util;
import com.alibaba.fastjson.JSONObject;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.apache.commons.codec.digest.DigestUtils;
import java.io.BufferedReader;
import java.io.InputStreamReader;
/**
*<p>
* 友盟推送客户端
*</p>
*
* @Author: entfrm开发团队-王翔
* @since: 2022/11/15
*/
public class PushClientUtil {
private OkHttpClient okHttpClient;
protected final String USER_AGENT = "Mozilla/5.0";
protected static final String host = "http://msg.umeng.com";
protected static final String postPath = "/api/send";
private static final String appMasterSecret = "kiv3ka9idqvqgiq7w3sudlp7azslty1r";
public PushClientUtil(OkHttpClient okHttpClient) {
this.okHttpClient = okHttpClient;
}
public boolean send(JSONObject jsonObject) throws Exception {
String timestamp = Integer.toString((int)(System.currentTimeMillis() / 1000));
jsonObject.put("timestamp", timestamp);
String url = host + postPath;
String postBody = jsonObject.toString();
String sign = DigestUtils.md5Hex(("POST" + url + postBody + appMasterSecret).getBytes("utf8"));
url = url + "?sign=" + sign;
// 发送post请求并获得响应
okhttp3.Request request = new okhttp3.Request
.Builder()
.url(url)
.addHeader("User-Agent", USER_AGENT)
.post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), postBody))
.build();
Response response = okHttpClient.newCall(request).execute();
int status = response.code();
System.out.println("Response Code : " + status);
BufferedReader rd = new BufferedReader(new InputStreamReader(response.body().byteStream()));
StringBuffer result = new StringBuffer();
String line;
while ((line = rd.readLine()) != null) {
result.append(line);
}
System.out.println(result);
if (status == 200) {
System.out.println("Notification sent successfully.");
} else {
System.out.println("Failed to send the notification!");
}
return true;
}
}

2
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml

@ -7,7 +7,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@
config: config:
server-addr: ${spring.cloud.nacos.discovery.server-addr} server-addr: ${spring.cloud.nacos.discovery.server-addr}

15
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java

@ -18,22 +18,19 @@ public class SimpleCrudGeneratorTest {
/** 代码生成全局配置 */ /** 代码生成全局配置 */
interface Config { interface Config {
String url = "jdbc:mysql://127.0.0.1:3306/kicc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"; String url = "jdbc:mysql://192.168.3.10:8052/kicc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
String username = "root"; String username = "root";
String password = "root"; String password = "kanglai@2022";
String author = "entfrm开发团队-王翔"; String author = "entfrm开发团队-王翔";
//String rootOutputDir = "/Users/wuyanzu/IdeaProjects/org/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java"; String rootOutputDir = "/Users/wangxiang/IdeaProjects/org/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java";
String rootOutputDir = "D:/IdeaProjects/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java";
//String entityOutputDir = "/Users/wuyanzu/IdeaProjects/org/kicc/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity"; String entityOutputDir = "/Users/wangxiang/IdeaProjects/org/kicc/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity";
String entityOutputDir = "D:/IdeaProjects/kicc/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity";
//String mapperXmlOutputDir = "/Users/wuyanzu/IdeaProjects/org/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper"; String mapperXmlOutputDir = "/Users/wangxiang/IdeaProjects/org/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper";
String mapperXmlOutputDir = "D:/IdeaProjects/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper";
String packageParent = "com.cloud.kicc.commonbiz"; String packageParent = "com.cloud.kicc.commonbiz";
@ -47,7 +44,7 @@ public class SimpleCrudGeneratorTest {
String packageController = "controller"; String packageController = "controller";
String[] includeTable = { "common_map_logistic", "common_map_handover_preset", "common_map_logistic_point", "common_map_task" }; String[] includeTable = { "common_message" };
String[] filterEntityTablePrefix = { "common_" }; String[] filterEntityTablePrefix = { "common_" };

6
kicc-register/src/main/resources/bootstrap.yml

@ -5,10 +5,10 @@ server:
db: db:
num: 1 num: 1
user: ${MYSQL_USER:root} user: ${MYSQL_USER:root}
password: ${MYSQL_PWD:root} #password: ${MYSQL_PWD:root}
#password: ${MYSQL_PWD:kanglai@2022} password: ${MYSQL_PWD:kanglai@2022}
url: url:
0: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true 0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true #0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
nacos: nacos:

Loading…
Cancel
Save