parent
5c2b705289
commit
74c22d3dc1
@ -0,0 +1,22 @@ |
||||
package com.bellmann.common.enums; |
||||
|
||||
import com.bellmann.common.base.IBaseEnum; |
||||
import lombok.Getter; |
||||
|
||||
public enum DummyFlagEnum implements IBaseEnum<String> { |
||||
|
||||
DUMMY("0","虚拟"), |
||||
NON_VIRTUAL("1","非虚拟"), |
||||
; |
||||
|
||||
@Getter |
||||
private String value; |
||||
|
||||
@Getter |
||||
private String label; |
||||
|
||||
DummyFlagEnum(String value, String label){ |
||||
this.label = label; |
||||
this.value = value; |
||||
} |
||||
} |
@ -0,0 +1,22 @@ |
||||
package com.bellmann.common.enums; |
||||
|
||||
import com.bellmann.common.base.IBaseEnum; |
||||
import lombok.Getter; |
||||
|
||||
public enum OrderDoneFlagEnum implements IBaseEnum<String> { |
||||
|
||||
RECEIPTS_HAVE_BEEN_RETURNED("0","已回单"), |
||||
THE_ORDER_HAS_NOT_BEEN_RETURNED("1","未回单"), |
||||
; |
||||
|
||||
@Getter |
||||
private String value; |
||||
|
||||
@Getter |
||||
private String label; |
||||
|
||||
OrderDoneFlagEnum(String value, String label){ |
||||
this.label = label; |
||||
this.value = value; |
||||
} |
||||
} |
@ -0,0 +1,25 @@ |
||||
package com.bellmann.common.enums; |
||||
|
||||
import com.bellmann.common.base.IBaseEnum; |
||||
import lombok.Getter; |
||||
|
||||
public enum ServiceFlagEnum implements IBaseEnum<String> { |
||||
|
||||
ACTIVATE_THE_SERVICE("A","开通业务"), |
||||
CANCEL_THE_BUSINESS("D","取消业务"), |
||||
CHANGE_OF_BUSINESS("M","变更业务"), |
||||
KEEP_THE_BUSINESS_GOING("K","保持业务"), |
||||
RESET_THE_BUSINESS("R","重置业务"), |
||||
; |
||||
|
||||
@Getter |
||||
private String value; |
||||
|
||||
@Getter |
||||
private String label; |
||||
|
||||
ServiceFlagEnum(String value, String label){ |
||||
this.label = label; |
||||
this.value = value; |
||||
} |
||||
} |
@ -0,0 +1,35 @@ |
||||
package com.bellmann.controller; |
||||
|
||||
|
||||
import com.bellmann.common.base.BasePageQuery; |
||||
import com.bellmann.common.result.PageResult; |
||||
import com.bellmann.model.vo.OrderInfoBusinessVO; |
||||
import com.bellmann.service.OrderServiceService; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
/** |
||||
* <p> |
||||
* 前端控制器 |
||||
* </p> |
||||
* |
||||
* @author 李小林 |
||||
* @since 2024-06-17 |
||||
*/ |
||||
@Tag(name = "21.工单业务管理") |
||||
@RestController |
||||
@RequiredArgsConstructor |
||||
@RequestMapping("/api/order-service/v1") |
||||
public class OrderServiceController { |
||||
|
||||
private final OrderServiceService orderServiceService; |
||||
|
||||
@PostMapping("/order-info-service/{orderId}") |
||||
@Operation(summary = "工单业务列表") |
||||
public PageResult<OrderInfoBusinessVO> orderInfoBusinessPage(@RequestBody BasePageQuery query, @PathVariable Long orderId){ |
||||
return orderServiceService.orderInfoBusinessPage(query,orderId); |
||||
} |
||||
} |
||||
|
@ -0,0 +1,14 @@ |
||||
package com.bellmann.converter; |
||||
|
||||
import com.bellmann.model.entity.OrderInfo; |
||||
import com.bellmann.model.form.ModifyOrderForm; |
||||
import org.mapstruct.Mapper; |
||||
|
||||
|
||||
@Mapper(componentModel = "spring") |
||||
public interface OrderInfoConverter { |
||||
|
||||
|
||||
ModifyOrderForm entity2ModifyForm(OrderInfo orderInfo); |
||||
|
||||
} |
@ -0,0 +1,27 @@ |
||||
package com.bellmann.converter; |
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import com.bellmann.model.entity.OrderService; |
||||
import com.bellmann.model.vo.OrderInfoBusinessVO; |
||||
import org.mapstruct.Mapper; |
||||
import org.mapstruct.Mapping; |
||||
import org.mapstruct.Mappings; |
||||
|
||||
/** |
||||
* 用户对象转换器 |
||||
* |
||||
* |
||||
* @since 2022/6/8 |
||||
*/ |
||||
@Mapper(componentModel = "spring") |
||||
public interface OrderServiceConverter { |
||||
|
||||
@Mappings({ |
||||
@Mapping(target = "serviceFlag", expression = "java(com.bellmann.common.base.IBaseEnum.getLabelByValue(entity.getServiceFlag(), com.bellmann.common.enums.ServiceFlagEnum.class))"), |
||||
}) |
||||
OrderInfoBusinessVO entity2PageVo(OrderService entity); |
||||
|
||||
Page<OrderInfoBusinessVO> entity2PageVo(Page<OrderService> entity); |
||||
|
||||
|
||||
} |
@ -0,0 +1,21 @@ |
||||
package com.bellmann.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import com.bellmann.model.entity.OrderService; |
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
/** |
||||
* <p> |
||||
* Mapper 接口 |
||||
* </p> |
||||
* |
||||
* @author 李小林 |
||||
* @since 2024-06-17 |
||||
*/ |
||||
@Mapper |
||||
public interface OrderServiceMapper extends BaseMapper<OrderService> { |
||||
|
||||
Page<OrderService> orderInfoBusinessPage(Page<OrderService> page, @Param("orderId") Long orderId); |
||||
} |
@ -0,0 +1,78 @@ |
||||
package com.bellmann.model.bo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.time.LocalDateTime; |
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
public class DeviceDetailBO { |
||||
|
||||
//dynamic
|
||||
private Long devId; |
||||
|
||||
private String connectReqUrl; |
||||
|
||||
private String devIp; |
||||
|
||||
private String devOnline; |
||||
|
||||
private LocalDateTime devOnlineTime; |
||||
|
||||
//detail
|
||||
private String userSnNo; |
||||
|
||||
private String iptvAccess; |
||||
|
||||
private String bandAccess; |
||||
|
||||
private String devRegStatus; |
||||
|
||||
private String devOwnerClass; |
||||
|
||||
private String remark1; |
||||
|
||||
private String remark2; |
||||
|
||||
private String remark3; |
||||
|
||||
private String remark4; |
||||
|
||||
|
||||
//device_static
|
||||
private Long typeAndVerId; |
||||
|
||||
private Long custId; |
||||
|
||||
private Long regionAreaId; |
||||
|
||||
private Long corpAreaId; |
||||
|
||||
private String devSno; |
||||
|
||||
private String devMac; |
||||
|
||||
private String devPppoe; |
||||
|
||||
private String devAdNo; |
||||
|
||||
private String devStatus; |
||||
|
||||
private Date devCreateTime; |
||||
|
||||
private Date devModifyTime; |
||||
|
||||
private String devSoapFlag; |
||||
|
||||
private String devInformFlag; |
||||
|
||||
private String devRemark1; |
||||
|
||||
private String devRemark2; |
||||
|
||||
private String devRemark3; |
||||
|
||||
private String devRemark4; |
||||
|
||||
private String devRemark5; |
||||
} |
@ -0,0 +1,42 @@ |
||||
package com.bellmann.model.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
/** |
||||
* <p> |
||||
* |
||||
* </p> |
||||
* |
||||
* @author 李小林 |
||||
* @since 2024-06-17 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@TableName("itms_order_service") |
||||
public class OrderService implements Serializable { |
||||
|
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
@TableId(value = "order_id", type = IdType.AUTO) |
||||
private Long orderId; |
||||
|
||||
private String service; |
||||
|
||||
private Long serviceId; |
||||
|
||||
private String serviceFlag; |
||||
|
||||
private String argsName; |
||||
|
||||
private String argsValueNew; |
||||
|
||||
private String argsValueOld; |
||||
|
||||
|
||||
} |
@ -0,0 +1,26 @@ |
||||
package com.bellmann.model.form; |
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
import java.time.LocalDateTime; |
||||
|
||||
@Data |
||||
@Schema(description = "修改工单表单") |
||||
public class ModifyOrderForm { |
||||
|
||||
private Long orderId; |
||||
|
||||
private String orderServiceType; |
||||
|
||||
private String orderCustomerKind; |
||||
|
||||
private String receivedOrderId; |
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
||||
private LocalDateTime orderDate; |
||||
|
||||
private String pppoeAccount; |
||||
|
||||
private String adNo; |
||||
} |
@ -0,0 +1,24 @@ |
||||
package com.bellmann.model.vo; |
||||
|
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
/** |
||||
* <p> |
||||
* |
||||
* </p> |
||||
* |
||||
* @author 李小林 |
||||
* @since 2024-06-17 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = false) |
||||
public class OrderInfoBusinessVO { |
||||
|
||||
private Long orderId; |
||||
|
||||
private String service; |
||||
|
||||
private String serviceFlag; |
||||
|
||||
} |
@ -0,0 +1,68 @@ |
||||
package com.bellmann.model.vo; |
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import com.fasterxml.jackson.annotation.JsonIgnore; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
import java.time.LocalDateTime; |
||||
|
||||
@Data |
||||
@Schema(description = "设备信息详细信息视图") |
||||
public class OrderInfoVO { |
||||
|
||||
private Long orderId; |
||||
|
||||
private String receivedOrderId; |
||||
|
||||
private String receivedOrderLhs; |
||||
|
||||
private String orderRemark; |
||||
|
||||
private String orderServiceType; |
||||
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") |
||||
private LocalDateTime orderDate; |
||||
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") |
||||
private LocalDateTime receiveDate; |
||||
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") |
||||
private LocalDateTime orderDealDate; |
||||
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") |
||||
private LocalDateTime orderDeadline; |
||||
|
||||
private String adNo; |
||||
|
||||
private String orderStatus; |
||||
|
||||
private String pppoeAccount; |
||||
|
||||
private String bandAccess; |
||||
|
||||
private String iptvAccess; |
||||
|
||||
private String userSnNo; |
||||
|
||||
private String remark; |
||||
|
||||
private String devOnlineStatus; |
||||
|
||||
private String userSnKey; |
||||
|
||||
private String devAccessType; |
||||
|
||||
@JsonIgnore |
||||
private String devSnoOui; |
||||
|
||||
@JsonIgnore |
||||
private Long systemDomain; |
||||
|
||||
private String domain; |
||||
|
||||
private String orderCustomerKind; |
||||
|
||||
private String orderDoneFlag; |
||||
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") |
||||
private LocalDateTime orderDoneDate; |
||||
|
||||
private String dummyFlag; |
||||
|
||||
} |
@ -0,0 +1,18 @@ |
||||
package com.bellmann.service; |
||||
|
||||
import com.bellmann.common.base.BasePageQuery; |
||||
import com.bellmann.common.result.PageResult; |
||||
import com.bellmann.model.vo.OrderInfoBusinessVO; |
||||
|
||||
/** |
||||
* <p> |
||||
* 服务类 |
||||
* </p> |
||||
* |
||||
* @author 李小林 |
||||
* @since 2024-06-17 |
||||
*/ |
||||
public interface OrderServiceService { |
||||
|
||||
PageResult<OrderInfoBusinessVO> orderInfoBusinessPage(BasePageQuery query, Long orderId); |
||||
} |
@ -0,0 +1,37 @@ |
||||
package com.bellmann.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import com.bellmann.common.base.BasePageQuery; |
||||
import com.bellmann.common.result.PageResult; |
||||
import com.bellmann.converter.OrderServiceConverter; |
||||
import com.bellmann.mapper.OrderServiceMapper; |
||||
import com.bellmann.model.entity.OrderService; |
||||
import com.bellmann.model.vo.OrderInfoBusinessVO; |
||||
import com.bellmann.service.OrderServiceService; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
/** |
||||
* <p> |
||||
* 服务实现类 |
||||
* </p> |
||||
* |
||||
* @author 李小林 |
||||
* @since 2024-06-17 |
||||
*/ |
||||
@Service |
||||
@RequiredArgsConstructor |
||||
public class OrderServiceServiceImpl implements OrderServiceService { |
||||
|
||||
private final OrderServiceMapper orderServiceMapper; |
||||
|
||||
private final OrderServiceConverter orderServiceConverter; |
||||
@Override |
||||
public PageResult<OrderInfoBusinessVO> orderInfoBusinessPage(BasePageQuery query, Long orderId) { |
||||
int pageNum = query.getPageNum(); |
||||
int pageSize = query.getPageSize(); |
||||
Page<OrderService> page = new Page<>(pageNum,pageSize); |
||||
Page<OrderService> dataPage = orderServiceMapper.orderInfoBusinessPage(page,orderId); |
||||
return PageResult.success(orderServiceConverter.entity2PageVo(dataPage)); |
||||
} |
||||
} |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,15 @@ |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\OB.jar -DgroupId=com.corba -DartifactId=OB -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\OBEvent.jar -DgroupId=com.corba -DartifactId=OBEvent -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\OBNaming.jar -DgroupId=com.corba -DartifactId=OBNaming -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\OBNotify.jar -DgroupId=com.corba -DartifactId=OBNotify -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\OBTime.jar -DgroupId=com.corba -DartifactId=OBTime -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\capapi.jar -DgroupId=com.bellmann -DartifactId=capapi -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\server.jar -DgroupId=com.bellmann -DartifactId=server -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\acsapi.jar -DgroupId=com.bellmann -DartifactId=acsapi -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\orderapi.jar -DgroupId=com.bellmann -DartifactId=orderapi -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\CloudApi.jar -DgroupId=com.bellmann -DartifactId=CloudApi -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\resourceapi.jar -DgroupId=com.bellmann -DartifactId=resourceapi -Dversion=1.0 -Dpackaging=jar |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\postgresql-9.3-1103-jdbc3.jar -DgroupId=org.postgresql -DartifactId=postgresql -Dversion=9.3-1103-jdbc3 -Dpackaging=jar |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\postgresql-42.2.5.jar -DgroupId=org.postgresql -DartifactId=postgresql -Dversion=42.2.5 -Dpackaging=jar |
||||
call mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\postgresql-42.2.27.jar -DgroupId=org.postgresql -DartifactId=org.postgresql -Dversion=42.2.27 -Dpackaging=jar |
||||
mvn install:install-file -Dfile=D:\zj\itms_zj\itms_pg\lib\orderapi.jar -DgroupId=com.bellmann -DartifactId=orderapi -Dversion=1.0 -Dpackaging=jar |
@ -0,0 +1,11 @@ |
||||
call mvn install:install-file -Dfile=OB.jar -DgroupId=com.corba -DartifactId=OB -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=OBEvent.jar -DgroupId=com.corba -DartifactId=OBEvent -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=OBNaming.jar -DgroupId=com.corba -DartifactId=OBNaming -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=OBNotify.jar -DgroupId=com.corba -DartifactId=OBNotify -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=OBTime.jar -DgroupId=com.corba -DartifactId=OBTime -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=capapi.jar -DgroupId=com.bellmann -DartifactId=capapi -Dversion=2.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=server.jar -DgroupId=com.bellmann -DartifactId=server -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=acsapi.jar -DgroupId=com.bellmann -DartifactId=acsapi -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=orderapi.jar -DgroupId=com.bellmann -DartifactId=orderapi -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=CloudApi.jar -DgroupId=com.bellmann -DartifactId=CloudApi -Dversion=1.0 -Dpackaging=jar & |
||||
call mvn install:install-file -Dfile=resourceapi.jar -DgroupId=com.bellmann -DartifactId=resourceapi -Dversion=1.0 -Dpackaging=jar |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,20 @@ |
||||
<?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.bellmann.mapper.DeviceTypeVerDetailMapper"> |
||||
|
||||
<select id="findDevAccessType" resultType="java.lang.String"> |
||||
SELECT |
||||
DEV_ACCESS_TYPE |
||||
FROM |
||||
ITMS_DEVICE_TYPE_VER_DETAIL |
||||
WHERE |
||||
TYPE_AND_VER_ID = ( |
||||
SELECT TYPE_AND_VER_ID |
||||
FROM ITMS_DEVICE_STATIC |
||||
WHERE DEV_AD_NO = #{adNo} |
||||
LIMIT 1 |
||||
) |
||||
</select> |
||||
</mapper> |
@ -0,0 +1,32 @@ |
||||
<?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.bellmann.mapper.OrderServiceMapper"> |
||||
|
||||
<!-- 通用查询映射结果 --> |
||||
<resultMap id="BaseResultMap" type="com.bellmann.model.entity.OrderService"> |
||||
<id column="order_id" property="orderId" /> |
||||
<result column="service" property="service" /> |
||||
<result column="service_id" property="serviceId" /> |
||||
<result column="service_flag" property="serviceFlag" /> |
||||
<result column="args_name" property="argsName" /> |
||||
<result column="args_value_new" property="argsValueNew" /> |
||||
<result column="args_value_old" property="argsValueOld" /> |
||||
</resultMap> |
||||
|
||||
<!-- 通用查询结果列 --> |
||||
<sql id="Base_Column_List"> |
||||
order_id, service, service_id, service_flag, args_name, args_value_new, args_value_old |
||||
</sql> |
||||
|
||||
<select id="orderInfoBusinessPage" resultMap="BaseResultMap"> |
||||
SELECT |
||||
DISTINCT |
||||
order_id, |
||||
service, |
||||
service_flag |
||||
FROM |
||||
itms_order_service |
||||
WHERE |
||||
order_id = #{orderId} |
||||
</select> |
||||
</mapper> |
Loading…
Reference in new issue