Skip to content

yangxiujun / paidan_demo

Go to a project
Commit ee9364cf by 刘鑫
Options

Merge remote-tracking branch 'origin/develop' into develop-16542

2 parents b9858377 d3159ef8
Expand all
Inline Side-by-side
Showing with 290 additions and 137 deletions
project-interface/src/main/java/com/dituhui/pea/util/DateUtil.java
package com.dituhui.pea.util;
import lombok.experimental.UtilityClass;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.util.Assert;
import java.text.MessageFormat;
......@@ -493,6 +494,16 @@ public class DateUtil {
return MessageFormat.format("{}小时{}分{}秒", hours, minutes, second);
}
}
/**
* 获取小时
*
* @param date
* @return
*/
public static Integer getHour(Date date) {
return DateUtils.toCalendar(date).get(Calendar.HOUR_OF_DAY);
}
//CHECKSTYLE:ON
}
project-order/src/main/java/com/dituhui/pea/order/common/SaasUtils.java
......@@ -109,7 +109,7 @@ public class SaasUtils {
/**
* 根据提供的地址信息，获取对应的片区图层
*/
public List<AdministrativeDistrictResp> getAdminDistrict(AdministrativeDistrictReq districtReq) {
public AdministrativeDistrictResp getAdminDistrict(AdministrativeDistrictReq districtReq) {
String webResultStr = saasRemoteService.getAdminDistrict(ak, districtReq);
log.info("queryBlocksByXySingle返回结果: ===> {}", webResultStr);
SaasWebResult webResult = JSONObject.parseObject(webResultStr, SaasWebResult.class);
......@@ -117,8 +117,11 @@ public class SaasUtils {
if (!webResult.getCode().equals("S001")) {
return null;
}
List<AdministrativeDistrictResp> administrativeDistrictResp = JSONObject.parseObject(JSONObject.toJSONString(webResult.getResult()), List.class);
return administrativeDistrictResp;
List<AdministrativeDistrictResp> administrativeDistrictResp = JSONObject.parseArray(JSONObject.toJSONString(webResult.getResult()), AdministrativeDistrictResp.class);
if (CollectionUtils.isNotEmpty(administrativeDistrictResp)) {
return administrativeDistrictResp.get(0);
}
return null;
}
......
project-order/src/main/java/com/dituhui/pea/order/controller/BusinessBlockController.java
......@@ -4,6 +4,7 @@ import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.BusinessServiceBlockAddReqDTO;
import com.dituhui.pea.order.dto.BusinessServiceBlockRemoveReqDTO;
import com.dituhui.pea.order.dto.BusinessServiceBlockUpdateReqDTO;
import com.dituhui.pea.order.service.BusinessBlockService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -60,6 +61,25 @@ public class BusinessBlockController {
}
return res;
}
/**
* 更新saas区块id列表
*
* @param req::layerId 图层ID
* @param req::teamId 小队ID
* @return
*/
@PostMapping("/business/service/block/updateAreaIds")
public Result<?> businessServiceBlockUpdateAreaIds(@RequestBody BusinessServiceBlockUpdateReqDTO req) {
// 新增服务范围
Result<?> res = null;
try {
res = businessBlockService.businessServiceBlockUpdateAreaIds(req.getBlockId(), req.getAreaIds());
} catch (BusinessException e) {
return Result.failed(e.getMessage());
}
return res;
}
/**
* 新增服务区块
......
project-order/src/main/java/com/dituhui/pea/order/controller/FendanController.java
......@@ -33,7 +33,7 @@ public class FendanController {
}
@RequestMapping(value = "getAdminDistrict", method = RequestMethod.POST)
public Result<List<AdministrativeDistrictResp>> getAdminDistrict(@RequestBody AdministrativeDistrictReq req) {
public Result<AdministrativeDistrictResp> getAdminDistrict(@RequestBody AdministrativeDistrictReq req) {
return fendanService.getAdminDistrict(req);
}
}
project-order/src/main/java/com/dituhui/pea/order/controller/MsgController.java
......@@ -40,10 +40,12 @@ public class MsgController {
MsgQuery request) {
CommonUtil.setNullValue(request);
request.setUserId(userId);
if (!"isRead".equalsIgnoreCase(request.getSort())) {
request.setSort("create_time");
} else {
if ("isRead".equalsIgnoreCase(request.getSort())) {
request.setSort("is_read");
} if ("type".equalsIgnoreCase(request.getSort())) {
request.setSort("type");
} else {
request.setSort("create_time");
}
if (!"asc".equalsIgnoreCase(request.getSortType())) {
request.setSortType("desc");
......
project-order/src/main/java/com/dituhui/pea/order/controller/OrderAssignController.java
......@@ -17,59 +17,57 @@ import java.time.LocalDateTime;
@RequestMapping("/pea-order")
public class OrderAssignController {
@Autowired
private OrderAssign orderAssign;
@Autowired
private OrderAssign orderAssign;
@GetMapping("/order/assign/recommend/engineers")
public Result<?> getOrderAssignRecommendEngineers(
@RequestParam String orderId, @RequestParam(required = false) String key,
@RequestParam(required = false) String distance, @RequestParam(required = false) String recommend) {
//服务单指派-推荐技术员列表
@GetMapping("/order/assign/recommend/engineers")
public Result<?> getOrderAssignRecommendEngineers(
@RequestParam String orderId, @RequestParam(required = false) String key,
@RequestParam(required = false) String distance, @RequestParam(required = false) String recommend) {
//服务单指派-推荐技术员列表
Result<?> res = null;
try {
res = orderAssign.getOrderAssignRecommendEngineers(orderId, key, distance, recommend);
}catch (BusinessException e) {
return Result.failed(e.getMessage());
}
return res;
}
Result<?> res = null;
try {
res = orderAssign.getOrderAssignRecommendEngineers(orderId, key, distance, recommend);
} catch (BusinessException e) {
return Result.failed(e.getMessage());
}
return res;
}
@PostMapping("/order/assign")
public Result<?> orderAssign(@RequestBody OrderAssignReq req) {
// 服务单指派-指派提交
Result<?> res = null;
try {
res = orderAssign.orderAssign(req.getOrderId(), req.getEngineerCode());
}catch (BusinessException e) {
return Result.failed(e.getMessage());
}
return res;
}
@PostMapping("/order/assign")
public Result<?> orderAssign(@RequestBody OrderAssignReq req) {
// 服务单指派-指派提交
Result<?> res = null;
try {
res = orderAssign.orderAssign(req);
} catch (BusinessException e) {
return Result.failed(e.getMessage());
}
return res;
}
@PostMapping("/order/revoke/assign")
public Result<?> orderRevokeAssign(@RequestBody OrderRevokeAssign req){
// 放回工单池
Result<?> res = null;
try{
res = orderAssign.orderRevokeAssign(req.getOrderId());
} catch (BusinessException e){
return Result.failed(e.getMessage());
}
return res;
}
@PostMapping("/order/revoke/assign")
public Result<?> orderRevokeAssign(@RequestBody OrderRevokeAssign req) {
// 放回工单池
Result<?> res = null;
try {
res = orderAssign.orderRevokeAssign(req.getOrderId());
} catch (BusinessException e) {
return Result.failed(e.getMessage());
}
return res;
}
@PostMapping("/order/rescheduling")
public Result<?> orderRescheduling(@RequestBody OrderReschedule req){
// 订单改约
Result<?> res = null;
LocalDateTime expectBegin = TimeUtils.IsoDateTime2LocalDateTime(req.getExpectBegin());
LocalDateTime expectEnd = TimeUtils.IsoDateTime2LocalDateTime(req.getExpectEnd());
try{
res = orderAssign.orderReschedule(req.getOrderId(), expectBegin, expectEnd, req.getExpectDesc());
} catch (BusinessException e){
return Result.failed(e.getMessage());
}
return res;
}
@PostMapping("/order/rescheduling")
public Result<?> orderRescheduling(@RequestBody OrderReschedule req) {
// 订单改约
Result<?> res = null;
try {
res = orderAssign.orderReschedule(req);
} catch (BusinessException e) {
return Result.failed(e.getMessage());
}
return res;
}
}
project-order/src/main/java/com/dituhui/pea/order/controller/OrderCreateController.java
......@@ -4,6 +4,7 @@ import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.OrderCreateReqDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryDTO;
import com.dituhui.pea.order.dto.param.OrderDTO;
import com.dituhui.pea.order.service.OrderCreateService;
import com.dituhui.pea.order.service.CapacityQueryService;
......@@ -22,7 +23,7 @@ public class OrderCreateController {
private CapacityQueryService capacityQueryService;
@PostMapping("/order/service/create")
public Result<?> createOrder(@Validated @RequestBody OrderCreateReqDTO orderCreateReqDTO) {
public Result<?> createOrder(@Validated @RequestBody OrderDTO.OrderCreateRequest orderCreateReqDTO) {
Result<?> res = null;
try {
res = orderCreateService.createOrder(orderCreateReqDTO);
......
project-order/src/main/java/com/dituhui/pea/order/controller/PeaApiController.java
......@@ -5,9 +5,11 @@ import com.dituhui.pea.order.common.jackson.DateUtil;
import com.dituhui.pea.order.common.jackson.JsonUtil;
import com.dituhui.pea.order.dto.param.*;
import com.dituhui.pea.order.service.EngineerCalendarService;
import com.dituhui.pea.order.service.OrderCreateService;
import com.dituhui.pea.order.service.PeaOuterAPIService;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
......@@ -30,6 +32,8 @@ public class PeaApiController {
private final EngineerCalendarService engineerCalendarService;
private final PeaOuterAPIService peaOuterAPIService;
@Autowired
private OrderCreateService orderCreateService;
private static final String capacity = "{\"groupId\": \"G100038\", \"params\": {\"beginDate\": \"2023-07-21\", \"endDate\": \"2023-07-27\", \"services\": [{\"brand\": \"博世\", \"productType\": \"多门冰箱\", \"serviceType\": \"商场样机安装\"}], \"location\": {\"addressId\":\"21231231\", \"latitude\": 120.608463, \"longitude\": 31.318442, \"name\": \"江苏省苏州市姑苏区蒋庙前\", \"address\": \"江苏省苏州市姑苏区解放大街123号\"}}, \"takeTime\": 720, \"datas\": [{\"date\": \"2023-07-21\", \"segments\": [{\"maxDuration\": 90, \"name\": \"全天\", \"beginTime\": \"2023-07-21 08:00:00\", \"endTime\": \"2023-07-21 17:59:59\", \"status\": 1, \"remain\": 3500}, {\"maxDuration\": 45, \"name\": \"上午\", \"beginTime\": \"2023-07-21 08:00:00\", \"endTime\": \"2023-07-21 11:59:59\", \"status\": 1, \"remain\": 2500}, {\"maxDuration\": 60, \"name\": \"下午\", \"beginTime\": \"2023-07-21 13:00:00\", \"endTime\": \"2023-07-21 17:59:59\", \"status\": 0, \"remain\": 1000}, {\"maxDuration\": 60, \"name\": \"时间段\", \"beginTime\": \"2023-07-21 13:00:00\", \"endTime\": \"2023-07-21 15:00:00\", \"status\": 1, \"remain\": 480}]}]}";
......@@ -113,7 +117,7 @@ public class PeaApiController {
@RequestParam("beginDate") Date beginDate,
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
Date endDate) throws IOException {
Date endDate) throws IOException {
ArrayList<String> strings = new ArrayList<>();
strings.add(half_capacity);
......@@ -160,8 +164,7 @@ public class PeaApiController {
*/
@PostMapping("/order/create")
public Result<?> orderCreate(@Validated @RequestBody OrderDTO.OrderCreateRequest request) {
return Result.success(null);
return orderCreateService.createOrder(request);
}
......
project-order/src/main/java/com/dituhui/pea/order/dao/MapBlockInfoDao.java
......@@ -24,8 +24,11 @@ public interface MapBlockInfoDao extends JpaRepository<MapBlockInfoEntity, Integ
List<MapBlockInfoEntity> findByAreaIdsIn(List<String> blockIds);
@Query(value = "select mbi.* from map_block_info mbi left join skill_info si on mbi.layer_id = si.layer_id left join map_layer_customize mlc on mlc.layer_id = mbi.layer_id " +
"where si.brand = :brand and si.`type` = :productType and si.skill = :skill and mbi.area_ids in ( :blockIds ) order by mlc.priority ", nativeQuery = true)
List<MapBlockInfoEntity> listTeamIdByBrandAndSkillAndBlockIds(@Param("brand") String brand, @Param("productType") String productType,
@Param("skill") String skill, @Param("blockIds") List<String> blockIds);
List<MapBlockInfoEntity> findByAreaIdsLike(String blockId);
@Query(value = "select mbi.* from map_block_info mbi left join map_layer_customize_skill mlcs on mlcs.layer_id = mbi.layer_id " +
"left join map_layer_customize mlc on mlc.layer_id = mbi.layer_id left join skill_info si on si.skill_code = mlcs.skill_code " +
"where si.brand = :brand and si.`type` = :productType and si.skill = :skill order by mlc.priority ", nativeQuery = true)
List<MapBlockInfoEntity> listTeamIdByBrandAndSkill(@Param("brand") String brand, @Param("productType") String productType,
@Param("skill") String skill);
}
project-order/src/main/java/com/dituhui/pea/order/dao/MsgDao.java
......@@ -16,7 +16,7 @@ import java.util.Objects;
public interface MsgDao extends JpaRepository<MsgEntity, Integer> {
@Query(value = "select t.cluster_id,t.branch_id,t.group_id" +
" from (" +
" select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read" +
" select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read,min(tt.type) type" +
" from zzz_msg tt join zzz_msg_receiver r on r.msg_id=tt.id and r.user_id=:#{#req.userId}" +
" where IF(:#{#req.startDate} is not null, tt.create_time>=:#{#req.startDate}, 1=1)" +
" and IF(:#{#req.endDate} is not null, tt.create_time<:#{#req.endDate}, 1=1)" +
......@@ -28,7 +28,7 @@ public interface MsgDao extends JpaRepository<MsgEntity, Integer> {
") t",
countQuery = "select count(t.cluster_id)" +
" from (" +
" select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read" +
" select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read,min(tt.type) type" +
" from zzz_msg tt join zzz_msg_receiver r on r.msg_id=tt.id and r.user_id=:#{#req.userId}" +
" where IF(:#{#req.startDate} is not null, tt.create_time>=:#{#req.startDate}, 1=1)" +
" and IF(:#{#req.endDate} is not null, tt.create_time<:#{#req.endDate}, 1=1)" +
......
project-order/src/main/java/com/dituhui/pea/order/dao/OrderInfoDao.java
......@@ -34,7 +34,7 @@ public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long>, JpaS
List<OrderInfoEntity> findByServiceStatusAndEngineerCode(String serviceStatus, String engineerCode);
List<OrderInfoEntity> findByDtAndAddressId(String dt, String addressId);
List<OrderInfoEntity> findByDtAndAddressId(LocalDate dt, String addressId);
List<OrderInfoEntity> findByMultipleOrders(String multipleOrders);
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrgGroupDao.java
......@@ -41,4 +41,6 @@ public interface OrgGroupDao extends JpaRepository<OrgGroupEntity, Integer> {
@Query(value = "SELECT og.* FROM org_group og left join org_team ot ON ot.group_id = og.group_id "
+ "WHERE ot.team_id = :teamId",nativeQuery = true)
OrgGroupEntity queryGroupByTeam(String teamId);
OrgGroupEntity getByCitycodeListLike(String citycodeList);
}
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessServerBlocksRespDTO.java
......@@ -15,14 +15,16 @@ public class BusinessServerBlocksRespDTO {
@Data
public static class Block {
private String id;
private Integer id;
private String areaIds;
private String groupId;
private String groupName;
private String layerId;
private String layerName;
private String teamId;
private String teamName;
private String area;
private Integer areaCount;
private String saasUrl;
private String updateTime;
}
}
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessServiceBlockUpdateReqDTO.java 0 → 100644
package com.dituhui.pea.order.dto;
import lombok.Data;
@Data
public class BusinessServiceBlockUpdateReqDTO {
private String blockId;
private String areaIds;
}
project-order/src/main/java/com/dituhui/pea/order/dto/MsgQuery.java
......@@ -29,7 +29,7 @@ public class MsgQuery {
private String userId;
/**
* 排序字段：create_time、is_read
* 排序字段：createTime、isRead、type
*/
private String sort;
......
project-order/src/main/java/com/dituhui/pea/order/dto/OrderAssignReq.java
......@@ -4,6 +4,11 @@ import lombok.Data;
@Data
public class OrderAssignReq {
private String engineerCode;
private String orderId;
private String engineerCode;
private String orderId;
/**
* 操作员
*/
private String operator;
}
project-order/src/main/java/com/dituhui/pea/order/dto/OrderReschedule.java
......@@ -8,4 +8,9 @@ public class OrderReschedule {
private String expectBegin;
private String expectEnd;
private String expectDesc;
/**
* 操作员
*/
private String operator;
}
project-order/src/main/java/com/dituhui/pea/order/dto/param/OrderDTO.java
package com.dituhui.pea.order.dto.param;
import com.dituhui.pea.util.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
......@@ -101,6 +104,11 @@ public class OrderDTO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expectEnd;
public static void main(String[] args) {
Date date = new Date();
int hour = DateUtils.toCalendar(date).get(Calendar.HOUR_OF_DAY);
System.out.println("当前小时为：" + hour);
}
/**
* 预约描述时间(全天/上午/下午)
*/
......
project-order/src/main/java/com/dituhui/pea/order/entity/MapBlockInfoEntity.java
......@@ -14,7 +14,7 @@ public class MapBlockInfoEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column(name = "area_ids", length = 1024, nullable = false)
@Column(name = "saas_area_ids", length = 1024)
private String areaIds;
@Column(name = "area_name", length = 50, nullable = false)
......@@ -32,7 +32,7 @@ public class MapBlockInfoEntity {
@Column(name = "city_code", nullable = true)
private String cityCode;
@Column(name = "areaCount")
@Column(name = "area_count")
private Long areaCount;
@Column(name = "area_data", nullable = true, columnDefinition = "json")
......@@ -47,11 +47,14 @@ public class MapBlockInfoEntity {
@Column(name = "layer_name", length = 50, nullable = false)
private String layerName;
@Column(name = "saas_layercode", length = 50, nullable = false)
@Column(name = "saas_layercode", length = 50)
private String saasLayercode;
@Column(name = "saas_layer_id", length = 50, nullable = false)
private String saasLayerName;
@Column(name = "saas_layer_id", length = 50)
private String saasLayerId;
@Column(name = "saas_url", length = 512)
private String saasUrl;
@Column(nullable = false)
private Boolean status;
......
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java
package com.dituhui.pea.order.entity;
import com.dituhui.pea.order.enums.OrderFlowEnum;
import lombok.Data;
import javax.persistence.*;
......@@ -131,7 +132,7 @@ public class OrderInfoEntity {
private String orderStatus = "NORMAL";
@Column(name = "service_status", nullable = true, length = 20, columnDefinition = "varchar(20) default 'INIT'")
private String serviceStatus = "INIT";
private String serviceStatus = OrderFlowEnum.INIT.name();
@Column(name = "engineer_code", nullable = true, length = 32, columnDefinition = "varchar(32) default ''")
private String engineerCode = "";
......@@ -217,7 +218,7 @@ public class OrderInfoEntity {
* 是否超派，0否 1是，默认0
*/
@Column(name = "transcend")
private Integer transcend;
private Integer transcend = 0;
/**
......
project-order/src/main/java/com/dituhui/pea/order/enums/OrderFlowEnum.java 0 → 100644
package com.dituhui.pea.order.enums;
/**
* 订单流程枚举类
*/
public enum OrderFlowEnum {
// 指派状态： INIT-待指派/PRE-预指派/CONFIRM-确认指派(通知BEAN)
INIT, PRE, CONFIRM,
}
project-order/src/main/java/com/dituhui/pea/order/enums/OrderStatus.java
package com.dituhui.pea.order.enums;
public enum OrderStatus {
CREATE("创建订单"),
NORMAL("正常"),
CANCELED("已取消"),
RESCHEDULED("已改约");
RESCHEDULED("已改约"),
ASSIGN("工单指派");
private final String description;
OrderStatus(String description){
......
project-order/src/main/java/com/dituhui/pea/order/enums/ServiceStatus.java
package com.dituhui.pea.order.enums;
public enum ServiceStatus {
// 服务状态：INIT-初始化/PENDING待服务/CONTACTED已排期/STARTED-已开始/FINISHED已完成/UNFINISHED-已上门未完成
INIT("待服务"),
PENDING("待服务"),
CONTACTED("已排期"),
......
project-order/src/main/java/com/dituhui/pea/order/service/BusinessBlockService.java
......@@ -7,6 +7,15 @@ public interface BusinessBlockService {
Result<?> businessServerBlocks(String levelType, String levelValue, int page, int size, String layerId, String teamId);
Result<?> businessServiceBlockAdd(String layerId, String teamId);
/**
* 更新saas区块id
*
* @param blockId
* @param areaIds
* @return
*/
Result<?> businessServiceBlockUpdateAreaIds(String blockId, String areaIds);
Result<?> businessServiceBlockRemove(String blockId);
......
project-order/src/main/java/com/dituhui/pea/order/service/FendanService.java
......@@ -27,5 +27,5 @@ public interface FendanService {
*/
Result<List<OrgGroupInfo>> fendanToGroup(OrderDTO.OrderCreateRequest request);
Result<List<AdministrativeDistrictResp>> getAdminDistrict(AdministrativeDistrictReq req);
Result<AdministrativeDistrictResp> getAdminDistrict(AdministrativeDistrictReq req);
}
project-order/src/main/java/com/dituhui/pea/order/service/OrderAssign.java
package com.dituhui.pea.order.service;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.OrderAssignReq;
import com.dituhui.pea.order.dto.OrderReschedule;
import org.bouncycastle.asn1.cms.TimeStampAndCRL;
import java.sql.Timestamp;
......@@ -13,9 +15,9 @@ public interface OrderAssign {
Result<?> getOrderAssignRecommendEngineers(String orderId, String key, String distance, String recommend);
// 服务单指派-指派提交
Result<?> orderAssign(String orderId, String engineerCode);
Result<?> orderAssign(OrderAssignReq req);
Result<?> orderRevokeAssign(String orderId);
Result<?> orderReschedule(String orderId, LocalDateTime expectBegin, LocalDateTime expectEnd, String expectDesc);
Result<?> orderReschedule(OrderReschedule req);
}
project-order/src/main/java/com/dituhui/pea/order/service/OrderCreateService.java
......@@ -19,12 +19,13 @@ package com.dituhui.pea.order.service;
import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.OrderCreateReqDTO;
import com.dituhui.pea.order.dto.param.OrderDTO;
public interface OrderCreateService {
Result<?> initParameter();
Result<?> createOrder(OrderCreateReqDTO orderCreateReqDTO)
Result<?> createOrder(OrderDTO.OrderCreateRequest orderCreateReqDTO)
throws BusinessException;
}
project-order/src/main/java/com/dituhui/pea/order/service/OrderInfoService.java
......@@ -2,6 +2,8 @@ package com.dituhui.pea.order.service;
import com.dituhui.pea.common.Result;
import java.time.LocalDate;
/**
* 订单相关
*/
......@@ -14,7 +16,7 @@ public interface OrderInfoService {
* @param addressId 地址id
* @return 有则返回多条订单关联id，没有则不是一家多单
*/
Result<String> addMultipleOrders(String dt, String addressId);
Result<String> addMultipleOrders(LocalDate dt, String addressId, String orderId);
/**
* 取消指定订单一家多台
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java
......@@ -10,8 +10,9 @@ import com.dituhui.pea.order.dto.BusinessServerBlocksRespDTO;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.feign.ISaaSRemoteService;
import com.dituhui.pea.order.service.BusinessBlockService;
import com.dituhui.pea.order.utils.RegionUtils;
import com.dituhui.pea.order.utils.TypeUtils;
import com.google.gson.internal.LinkedTreeMap;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -38,6 +39,10 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
String ak;
@Value("${SaaS.url}")
String url;
@Value("${SaaS.userAccount}")
String userAccount;
@Value("${SaaS.userPassword}")
String password;
@Autowired
private OrgTeamDao orgTeamDao;
@Autowired
......@@ -120,14 +125,25 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
String groupId = team.getGroupId();
String groupName = groupMapping.get(groupId);
block.setId(b.getAreaIds());
block.setId(b.getId());
block.setAreaIds(b.getAreaIds());
if (StringUtils.isNotBlank(b.getAreaIds())) {
block.setAreaCount(b.getAreaIds().split(",").length);
} else {
block.setAreaCount(0);
}
block.setGroupId(groupId);
block.setGroupName(groupName);
block.setLayerId(b.getLayerId());
block.setLayerName(b.getLayerName());
block.setTeamId(b.getTeamId());
block.setTeamName(team.getTeamName());
// block.setArea(b.getArea().toString());
// 组装url
String saasUrl = url + "/mlAutoLogin?userAccount=" + userAccount + "&password=" + password
+ "&jump=basedata&navHidden=true&layerId=" + StringUtils.trimToEmpty(b.getSaasLayerId())
+ "&layercode=" + StringUtils.trimToEmpty(b.getSaasLayercode()) + "&area_ids="
+ StringUtils.trimToEmpty(b.getAreaIds());
block.setSaasUrl(saasUrl);
if(null != b.getUpdateTime()) {
block.setUpdateTime(TimeUtils.IsoLocalDateTime2String(b.getUpdateTime()));
}
......@@ -170,31 +186,24 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
// 重复检查layerId+teamId 注意：1个小队可以对应多个图层
MapBlockInfoEntity existBlock = mapBlockInfoDao.findByTeamIdAndLayerId(teamId, layerId);
if (null != existBlock) {
return Result.failure("区块已存在");
return Result.failure("该工作队图层服务范围已存在");
}
// 同步到saas，返回blockId
// 获取小队出发点，初始化区块
OrgGroupEntity group = orgGroupDao.getByGroupId(team.getGroupId());
String center = RegionUtils.constructCenter(group.getX(), group.getY());
// 获取saas图层id
String saasLayerId = getSaaSLayerId(team.getBranchId(), layerId);
if (StringUtils.isEmpty(saasLayerId)) {
return Result.failure(team.getTeamName() + " 图层未配置");
}
String result = saasRemoteService.addArea(ak, team.getTeamName(), saasLayerId, center);
log.info("params:{} {} {} {} result:{}", team.getTeamName(), saasLayerId, center, result);
Result<String> saasResult = TypeUtils.convertResult(result);
// 同步初始化saas区划图层，图层命名方式：分部id_图层id，先检查一下图层是否存在，不存在则新建。FIXME saas处理逻辑
String saasLayerName = team.getBranchId() + "_" + layerId;
String result = saasRemoteService.addLayer(ak, saasLayerName, 1, 1);
log.info("addLayer params:{} result:{}", layerName, result);
System.out.println(result);
Result<LinkedTreeMap<String, Object>> saasResult = TypeUtils.convertResult(result);
if (!ResultEnum.SUCCESS.getCode().equals(saasResult.getCode())) {
return Result.failure("区块已存在或者裁剪为空");
return Result.failure(saasResult.getMessage());
}
String blockId = saasResult.getResult();
String blockName = String.format("%s_%s", layerName, team.getTeamName()); //区块名称
// 返回layerid和code
String saasLayerId = (String) saasResult.getResult().get("id");// 存入pea
String saasLayercode = (String) saasResult.getResult().get("code");// 存入pea
MapBlockInfoEntity block = new MapBlockInfoEntity();
block.setAreaIds(blockId);
String blockName = String.format("%s_%s", layerName, team.getTeamName()); //区块名称
block.setAreaName(blockName);
block.setBranchId(team.getBranchId());
block.setGroupId(team.getGroupId());
......@@ -202,7 +211,9 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
block.setLayerId(layerId);
block.setLayerName(layerName);
block.setStatus(true);
//block.setArea(0L);
block.setAreaCount(0L);
block.setSaasLayerId(saasLayerId);
block.setSaasLayercode(saasLayercode);
block.setCreateTime(LocalDateTime.now());
block.setUpdateTime(block.getCreateTime());
entityManager.persist(block);
......@@ -210,6 +221,24 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
return Result.success(null);
}
@Transactional
@Override
public Result<?> businessServiceBlockUpdateAreaIds(String blockId, String areaIds) throws BusinessException {
MapBlockInfoEntity block = mapBlockInfoDao.getById(Integer.parseInt(blockId));
if (null != block) {
block.setAreaIds(areaIds);
if (StringUtils.isBlank(areaIds)) {
block.setAreaCount(0L);
} else {
block.setAreaCount((long) areaIds.split(",").length);
}
}
mapBlockInfoDao.save(block);
mapBlockInfoDao.flush();
return Result.success(null);
}
/**
* 获取saas图层id
*
......@@ -262,10 +291,6 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
throw new BusinessException("区块不存在");
}
// TODO 根据当前block转换成分部，再转换成对应账号信息
String userAccount = "sMvf3yZWA69lKcvlgKcOHQ==";
String password = "qjOHxpQPXLnJP+Jq1CZGBQ==";
// 跳转SaaS url
// 获取saas图层id
String saasLayerId = getSaaSLayerId(block.getBranchId(), block.getLayerId());
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
......@@ -10,6 +10,7 @@ import com.dituhui.pea.order.dto.DispatchEngineerOrderListResp;
import com.dituhui.pea.order.dto.DispatchOrderListReq;
import com.dituhui.pea.order.dto.DispatchOrderListResp;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.enums.OrderFlowEnum;
import com.dituhui.pea.order.enums.OrderGroupEnum;
import com.dituhui.pea.order.enums.OrderStatus;
import com.dituhui.pea.order.service.DispatchService;
......@@ -298,7 +299,7 @@ public class DispatchServiceImpl implements DispatchService {
Root<OrderInfoEntity> root = update.from(OrderInfoEntity.class);
update.set(root.get("planStartTime"), planStartTime);
update.set(root.get("planEndTime"), planEndTime);
update.set(root.get("appointmentStatus"), "CONFIRM");
update.set(root.get("appointmentStatus"), OrderFlowEnum.CONFIRM.name());
update.set(root.get("appointmentMethod"), "MANUAL");
update.set(root.get("engineerCode"), engineerCode);
update.where(
......@@ -441,7 +442,7 @@ public class DispatchServiceImpl implements DispatchService {
List<Predicate> predicates = new ArrayList<>();
predicates.add(criteriaBuilder.equal(root.get("dt"), TimeUtils.IsoDate2LocalDate(reqDTO.getDate())));
predicates.add(criteriaBuilder.equal(root.get("appointmentStatus"), "INIT"));
predicates.add(criteriaBuilder.equal(root.get("appointmentStatus"), OrderFlowEnum.INIT.name()));
String levelType = reqDTO.getLevelType();
String levelValue = reqDTO.getLevelValue();
......@@ -775,7 +776,7 @@ class OrderRequestScheduler {
List<Line> newTasks = new ArrayList<>();
for (OrderInfoEntity o : orderRequests) {
if (!o.getAppointmentStatus().equals("INIT")) {
if (!o.getAppointmentStatus().equals(OrderFlowEnum.INIT.name())) {
continue;
}
Line t = new Line(o.getOrderId(), 30);
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java
......@@ -7,6 +7,7 @@ import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.EngineersGanttDTO;
import com.dituhui.pea.order.dto.LabelValueDTO;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.enums.OrderFlowEnum;
import com.dituhui.pea.order.service.EngineerGanttService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -84,7 +85,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
slots = new ArrayList<>();
}
slot.setBgColor(getColor(order.getServiceStatus()));
if (!order.getAppointmentStatus().equals("CONFIRM")) {
if (!order.getAppointmentStatus().equals(OrderFlowEnum.CONFIRM.name())) {
slot.setBorderStyle("dashed"); // 未确认的指派，统一加上虚框
}
slots.add(slot);
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerTimelineServiceImpl.java
......@@ -12,6 +12,7 @@ import com.dituhui.pea.order.entity.OrderEventEntity;
import com.dituhui.pea.order.entity.OrderInfoEntity;
import com.dituhui.pea.order.entity.OrgGroupEntity;
import com.dituhui.pea.order.entity.OrgWarehouseInfoEntity;
import com.dituhui.pea.order.enums.OrderFlowEnum;
import com.dituhui.pea.order.service.EngineerTimelineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -88,7 +89,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
private List<OrderInfoEntity> selectEngineerOrders(String engineerCode, LocalDate dt){
List<OrderInfoEntity> orders = orderInfoDao.findByEngineerCodeAndDtAndAppointmentStatusIn(
engineerCode, dt, List.of("PRE", "CONFIRM"));
engineerCode, dt, List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
return orders.stream().filter(o -> !o.getOrderStatus().equals("CANCEL")).collect(Collectors.toList());
}
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/FendanServiceImpl.java
......@@ -153,18 +153,23 @@ public class FendanServiceImpl implements FendanService {
//2:根据服务范围匹配工作队
String peaBrand = fixBrand(request.getBrand());
List<String> blockIds = blockInfos.stream().map(SaasUtils.BlockInfo::getBlockId).distinct().collect(Collectors.toList());
//区划所在范围并分配到具体技能的工作队
List<MapBlockInfoEntity> mapBlockInfoList = mapBlockInfoDao.listTeamIdByBrandAndSkillAndBlockIds(peaBrand, request.getProductType(), request.getServiceType(), blockIds);
List<MapBlockInfoEntity> mapBlockInBlockIdsList = new ArrayList<>();
//区划所在范围所有工作队
List<MapBlockInfoEntity> mapBlockInBlockIdsList = mapBlockInfoDao.findByAreaIdsIn(blockIds);
if (CollectionUtils.isEmpty(mapBlockInfoList) && CollectionUtils.isEmpty(mapBlockInBlockIdsList)) {
for (String blockId : blockIds) {
List<MapBlockInfoEntity> mapBlockInfoEntities = mapBlockInfoDao.findByAreaIdsLike(blockId);
mapBlockInBlockIdsList.addAll(mapBlockInfoEntities);
}
//区划所在范围并分配到具体技能的工作队
List<MapBlockInfoEntity> mapBlockSkillList = mapBlockInfoDao.listTeamIdByBrandAndSkill(peaBrand, request.getProductType(), request.getServiceType());
if (CollectionUtils.isEmpty(mapBlockSkillList) && CollectionUtils.isEmpty(mapBlockInBlockIdsList)) {
return Result.failed(StatusCodeEnum.FENDAN_TEAM_UNMATCHED);
}
List<Integer> mapBlockIdList = mapBlockInfoList.stream().map(MapBlockInfoEntity::getId).distinct().collect(Collectors.toList());
//筛选漏选工作队（处理全技能图层）
List<Integer> mapBlockAllList = mapBlockSkillList.stream().map(MapBlockInfoEntity::getId).distinct().collect(Collectors.toList());
//筛选漏选工作队（处理全技能图层）和查出多余图层
List<MapBlockInfoEntity> mapBlockInfoList = new ArrayList<>();
for (MapBlockInfoEntity mapBlockInfoEntity : mapBlockInBlockIdsList) {
if (mapBlockIdList.contains(mapBlockInfoEntity.getId())) {
continue;
if (mapBlockAllList.contains(mapBlockInfoEntity.getId())) {
mapBlockInfoList.add(mapBlockInfoEntity);
}
if (mapBlockInfoEntity.getLayerId().equals(allLayerId)) {
mapBlockInfoList.add(mapBlockInfoEntity);
......@@ -203,8 +208,9 @@ public class FendanServiceImpl implements FendanService {
}
@Override
public Result<List<AdministrativeDistrictResp>> getAdminDistrict(AdministrativeDistrictReq req) {
return Result.success(saasUtils.getAdminDistrict(req));
public Result<AdministrativeDistrictResp> getAdminDistrict(AdministrativeDistrictReq req) {
AdministrativeDistrictResp adminDistrict = saasUtils.getAdminDistrict(req);
return Result.success(adminDistrict);
}
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java
......@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;
......@@ -32,14 +33,22 @@ public class OrderInfoServiceImpl implements OrderInfoService {
*/
@Override
@Transactional
public Result<String> addMultipleOrders(String dt, String addressId) {
public Result<String> addMultipleOrders(LocalDate dt, String addressId, String orderId) {
List<OrderInfoEntity> infoList = orderInfoDao.findByDtAndAddressId(dt, addressId);
if (CollectionUtils.isEmpty(infoList)) {
return Result.success(null);
}
List<String> multipleOrdersList = infoList.stream().filter(e -> StringUtils.isNotEmpty(e.getMultipleOrders())).map(OrderInfoEntity::getMultipleOrders).distinct().collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(multipleOrdersList)) {
return Result.success(multipleOrdersList.get(0));
//排除自己
List<String> multipleOrdersList = infoList.stream().filter(e -> !e.getOrderId().equals(orderId))
.map(OrderInfoEntity::getMultipleOrders).distinct().collect(Collectors.toList());
if (CollectionUtils.isEmpty(multipleOrdersList)) {
return Result.success(null);
}
//查看是否已存在一家多单id存在则返回
List<String> multipleOrdersFilterList = infoList.stream().filter(e -> StringUtils.isNotEmpty(e.getMultipleOrders()))
.map(OrderInfoEntity::getMultipleOrders).distinct().collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(multipleOrdersFilterList)) {
return Result.success(multipleOrdersFilterList.get(0));
}
String uuid = UUIDUtil.getUuid();
for (OrderInfoEntity orderInfoEntity : infoList) {
......@@ -59,6 +68,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
@Override
@Transactional
public Result deleteMultipleOrders(String multipleOrders, String orderId) {
if (StringUtils.isBlank(multipleOrders)) {
return Result.success();
}
List<OrderInfoEntity> infoList = orderInfoDao.findByMultipleOrders(multipleOrders);
for (OrderInfoEntity infoEntity : infoList) {
if (infoEntity.getOrderId().equals(orderId)) {
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/PeaOuterAPIServiceImpl.java
......@@ -9,6 +9,7 @@ import com.dituhui.pea.order.dto.param.Order;
import com.dituhui.pea.order.dto.param.OrderDTO;
import com.dituhui.pea.order.entity.OrderInfoEntity;
import com.dituhui.pea.order.entity.OrgGroupEntity;
import com.dituhui.pea.order.enums.OrderFlowEnum;
import com.dituhui.pea.order.service.PeaOuterAPIService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
......@@ -61,7 +62,7 @@ public class PeaOuterAPIServiceImpl implements PeaOuterAPIService {
@Override
public Order orderIncreaseQuery(String engineerCode, Location location, Integer idleDuration) {
OrderInfoEntity sss = orderInfoDao.findTopBySkillAndAppointmentStatus("标准安装", "INIT");
OrderInfoEntity sss = orderInfoDao.findTopBySkillAndAppointmentStatus("标准安装", OrderFlowEnum.INIT.name());
Order order = new Order();
order.setOrderId(sss.getOrderId());
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
......@@ -8,6 +8,7 @@ import com.dituhui.pea.order.common.TimeUtils;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.*;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.enums.OrderFlowEnum;
import com.dituhui.pea.order.service.ScheduleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
......@@ -94,7 +95,7 @@ public class ScheduleServiceImpl implements ScheduleService {
team.setLevel("team");
// 获取改team订单列表
List<OrderInfoEntity> orders = orderInfoDao.findByDtAndOrgTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of("PRE", "CONFIRM"));
List<OrderInfoEntity> orders = orderInfoDao.findByDtAndOrgTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
team.setOrder(this.getTeamOrderSum(orders, skillMapping));
// 技术员指派单列表
......@@ -159,7 +160,7 @@ public class ScheduleServiceImpl implements ScheduleService {
List<LabelValueDTO> emptyTips = new ArrayList<>();
List<OrderInfoEntity> orderAppointments = orderInfoDao.findByEngineerCodeAndDtAndAppointmentStatusIn(
engineerCode, date, List.of("PRE", "CONFIRM"));
engineerCode, date, List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
List<TimeLineDTO> timelines = new ArrayList<>();
for (OrderInfoEntity o : orderAppointments) {
TimeLineDTO item = new TimeLineDTO();
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
......@@ -10,6 +10,7 @@ import com.dituhui.pea.order.dto.OrderChangeListDTO;
import com.dituhui.pea.order.dto.WorkbenchSummaryResp;
import com.dituhui.pea.order.entity.OrderEventEntity;
import com.dituhui.pea.order.entity.OrderInfoEntity;
import com.dituhui.pea.order.enums.OrderFlowEnum;
import com.dituhui.pea.order.service.WorkbenchService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -240,7 +241,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
Long autoTotal = summary.getOrDefault("autoTotal", 0L);
Long total = summary.getOrDefault("total", 0L);
HashMap<String, List<String>> p = this.packParams("appointmentStatus", "INIT");
HashMap<String, List<String>> p = this.packParams("appointmentStatus", OrderFlowEnum.INIT.name());
HashMap<String, List<String>> p1 = this.packParams("appointmentType", "MANUAL");
p1.putAll(p);
......
project-order/src/main/resources/application.yaml
......@@ -63,6 +63,8 @@ sentry:
SaaS:
url: https://pea-test.bshg.com.cn
ak: 64e1cde3f9144bfb850b7d37c51af559
userAccount: sMvf3yZWA69lKcvlgKcOHQ==
userPassword: qjOHxpQPXLnJP+Jq1CZGBQ==
bean:
server: https://bean-test.bshg.com.cn
app-key: eDZEhTCxAcM9paRfwPjAM7RGkfmbf15S_PEA
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!