From 55b1820e0824e06d373ef246ccf7cf6433c195b8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 18 六月 2024 16:53:42 +0800
Subject: [PATCH] 增加大屏显示模块
---
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/entity/OrderDetail.java | 177 +++++++++++++
hangzhoumesParent/common/pom.xml | 1
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/entity/Order.java | 232 +++++++++++++++++
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/impl/OrderServiceImpl.java | 32 ++
hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt | 32 ++
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java | 16 +
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/impl/DisplayScreenServiceImpl.java | 27 ++
hangzhoumesParent/common/displayscreen/pom.xml | 33 ++
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/DisplayScreenService.java | 17 +
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml | 2
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java | 20 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml | 5
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java | 47 +++
/dev/null | 5
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java | 21 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml | 5
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java | 16 +
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java | 36 ++
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/OrderService.java | 22 +
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java | 16 +
hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 5
22 files changed, 762 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/displayscreen/pom.xml b/hangzhoumesParent/common/displayscreen/pom.xml
new file mode 100644
index 0000000..a06119b
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>common</artifactId>
+ <groupId>com.mes</groupId>
+ <version>1.0-SNAPSHOT</version>
+
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>displayscreen</artifactId>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>sqljdbc4</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mes</groupId>
+ <artifactId>servicebase</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java
new file mode 100644
index 0000000..cf76dd4
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java
@@ -0,0 +1,36 @@
+package com.mes.displayscreen.controller;
+import com.mes.displayscreen.service.DisplayScreenService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+@RestController
+@RequestMapping("/DisplayScreen")
+@Slf4j
+public class DisplayScreenController {
+ @Autowired
+ //鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
+ private DisplayScreenService displayScreenService;
+
+// @ApiOperation("鏄剧ず宸ョ▼閫夋嫨淇℃伅")
+// @PostMapping("/listByState") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
+// @ResponseBody
+// public Result<List<OptimizeProject>> listByState(@RequestBody OptimizeRequest optimizeRequest) {
+// log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
+// List<OptimizeProject> glass = displayScreenService.listByState(optimizeRequest);
+// log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
+// return Result.build(200, "", glass);
+// }
+
+}
+
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/DisplayScreenService.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/DisplayScreenService.java
new file mode 100644
index 0000000..0fa99d9
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/DisplayScreenService.java
@@ -0,0 +1,17 @@
+package com.mes.displayscreen.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.order.entity.Order;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+public interface DisplayScreenService extends IService<Order> {
+
+}
+
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/impl/DisplayScreenServiceImpl.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/impl/DisplayScreenServiceImpl.java
new file mode 100644
index 0000000..d3db065
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/impl/DisplayScreenServiceImpl.java
@@ -0,0 +1,27 @@
+package com.mes.displayscreen.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.mes.displayscreen.service.DisplayScreenService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+//@Service
+//@Slf4j
+//
+//public class DisplayScreenServiceImpl extends ServiceImpl<> implements DisplayScreenService {
+//
+//
+//}
\ No newline at end of file
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java
new file mode 100644
index 0000000..f3bec96
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java
@@ -0,0 +1,47 @@
+package com.mes.order.controller;
+import com.mes.displayscreen.service.DisplayScreenService;
+import com.mes.order.entity.Order;
+import com.mes.order.service.OrderService;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-17
+ */
+@RestController
+@RequestMapping("/order/order")
+@Slf4j
+public class OrderController {
+ private OrderService orderService;
+ @ApiOperation("鏄剧ず澶у睆璁㈠崟鏁版嵁")
+ @PostMapping("/selectOrder") //鏄剧ず澶у睆璁㈠崟鏁版嵁
+ @ResponseBody
+ public Result<List<Order>> selectOrder(@RequestBody Order order) {
+ log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
+ List<Order> orders = orderService.selectOrder(order);
+ log.info("鏄剧ず璁㈠崟琛�:{}", orders);
+ return Result.build(200, "", orders);
+ }
+
+ @ApiOperation("鏄剧ず澶у睆璁㈠崟鏄庣粏鏁版嵁")
+ @PostMapping("/selectOrderDetail") //鏄剧ず澶у睆璁㈠崟鏄庣粏鏁版嵁
+ @ResponseBody
+ public Result<List<Order>> selectOrderDetail(@RequestBody Order order) {
+ log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
+ List<Order> orders = orderService.selectOrderDetail(order);
+ log.info("鏄剧ず璁㈠崟鏄庣粏琛�:{}", orders);
+ return Result.build(200, "", orders);
+ }
+
+
+}
+
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/entity/Order.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/entity/Order.java
new file mode 100644
index 0000000..0547f19
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/entity/Order.java
@@ -0,0 +1,232 @@
+package com.mes.order.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Order implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * <璁㈠崟琛�>
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 璁㈠崟Id
+ */
+ private String orderId;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String project;
+
+ /**
+ * 瀹㈡埛Id
+ */
+ private Long customerId;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ private String customerName;
+
+ /**
+ * 璁㈠崟绫诲瀷
+ */
+ private String orderType;
+
+ /**
+ * 璁㈠崟鍒嗙被
+ */
+ private String orderClassify;
+
+ /**
+ * 鍟嗘爣閫夐」
+ */
+ private String icon;
+
+ /**
+ * 鍖呰鏂瑰紡
+ */
+ private String packType;
+
+ /**
+ * 閫佽揣鏃堕棿
+ */
+ private LocalDateTime deliveryDate;
+
+ /**
+ * 鎵规
+ */
+ private String batch;
+
+ /**
+ * 璁＄畻鏂瑰紡
+ */
+ private Integer calculateType;
+
+ /**
+ * 閿�鍞汉鍛業d
+ */
+ private String salesmanId;
+
+ /**
+ * 閿�鍞汉
+ */
+ private String salesman;
+
+ /**
+ * 閾濇潯鏂瑰紡
+ */
+ private String alType;
+
+ /**
+ * 閲戦
+ */
+ private BigDecimal money;
+
+ /**
+ * 鍚堝悓缂栧彿
+ */
+ private String contractId;
+
+ /**
+ * 瀹㈡埛鎵规
+ */
+ private String customerBatch;
+
+ /**
+ * 鑱旂郴浜�
+ */
+ private String contacts;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String contactNumber;
+
+ /**
+ * 閫佽揣鍦板潃
+ */
+ private String deliveryAddress;
+
+ /**
+ * 鍏朵粬閲戦
+ */
+ private BigDecimal otherMoney;
+
+ /**
+ * 鍏朵粬閲戦澶囨敞
+ */
+ private String otherMoneyRemarks;
+
+ /**
+ * 璁㈠崟鍔犲伐澶囨敞
+ */
+ private String processingNote;
+
+ /**
+ * 鍏朵粬澶囨敞
+ */
+ private String otherRemarks;
+
+ /**
+ * 闈㈢Н
+ */
+ private BigDecimal area;
+
+ /**
+ * 鏁伴噺
+ */
+ private Long quantity;
+
+ /**
+ * 鍛ㄩ暱
+ */
+ private String perimeter;
+
+ /**
+ * 瀹℃牳浜篿d
+ */
+ private String verifierId;
+
+ /**
+ * 瀹℃牳浜�
+ */
+ private String verifier;
+
+ /**
+ * 鍒涘缓浜篿d
+ */
+ private String creatorId;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private String creator;
+
+ /**
+ * 涓嬪崟
+ */
+ private Integer createOrder;
+
+ /**
+ * 宸ヨ壓瀹℃牳
+ */
+ private Integer processReview;
+
+ /**
+ * 璁㈠崟瀹℃牳
+ */
+ private Integer orderReview;
+
+ /**
+ * 鐢熶骇璁㈠崟
+ */
+ private Integer productionOrder;
+
+ /**
+ * 娴佺▼鍗�
+ */
+ private Integer processingCard;
+
+ /**
+ * 鍏ュ簱 鏈叆搴撶姸鎬�0锛屾湭瀹屽叏鍏ュ簱鐘舵��1锛屽畬鍏ㄥ叆搴撶姸鎬�2
+ */
+ private Integer warehousing;
+
+ /**
+ * 鍙戣揣
+ */
+ private Integer delivery;
+
+ /**
+ * 鍒涘缓鏃ユ湡
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java
new file mode 100644
index 0000000..f9ed0af
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java
@@ -0,0 +1,16 @@
+package com.mes.order.mapper;
+
+import com.mes.order.entity.Order;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-17
+ */
+public interface OrderMapper extends BaseMapper<Order> {
+
+}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.xml b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
similarity index 73%
rename from hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.xml
rename to hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
index 9a0cd27..39b3ea8 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.xml
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
@@ -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.mes.role.mapper.SysRoleMapper">
+<mapper namespace="com.mes.order.mapper.OrderMapper">
</mapper>
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/OrderService.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/OrderService.java
new file mode 100644
index 0000000..edf1951
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/OrderService.java
@@ -0,0 +1,22 @@
+package com.mes.order.service;
+
+import com.mes.order.entity.Order;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-17
+ */
+public interface OrderService extends IService<Order> {
+
+ List<Order> selectOrder(Order order);
+
+ List<Order> selectOrderDetail(Order order);
+}
+
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/impl/OrderServiceImpl.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/impl/OrderServiceImpl.java
new file mode 100644
index 0000000..f9e7d26
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/impl/OrderServiceImpl.java
@@ -0,0 +1,32 @@
+package com.mes.order.service.impl;
+
+import com.mes.order.entity.Order;
+import com.mes.order.mapper.OrderMapper;
+import com.mes.order.service.OrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-17
+ */
+@Service
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+ @Override
+ public List<Order> selectOrder(Order order) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List<Order> selectOrderDetail(Order order) {
+ return Collections.emptyList();
+ }
+}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java
new file mode 100644
index 0000000..27398a8
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java
@@ -0,0 +1,21 @@
+package com.mes.orderdetail.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-18
+ */
+@RestController
+@RequestMapping("/orderdetail/order-detail")
+public class OrderDetailController {
+
+}
+
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/entity/OrderDetail.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/entity/OrderDetail.java
new file mode 100644
index 0000000..a4931f9
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/entity/OrderDetail.java
@@ -0,0 +1,177 @@
+package com.mes.orderdetail.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OrderDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * <璁㈠崟浜у搧鏄庣粏>
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁㈠崟Id
+ */
+ private String orderId;
+
+ /**
+ * 璁㈠崟浜у搧鑷簭
+ */
+ private Integer orderNumber;
+
+ /**
+ * 妤煎彿
+ */
+ private String buildingNumber;
+
+ /**
+ * 浜у搧Id
+ */
+ private Long productId;
+
+ /**
+ * 浜у搧鍚嶇О
+ */
+ private String productName;
+
+ /**
+ * 鍗曚环
+ */
+ private BigDecimal price;
+
+ /**
+ * 鏁伴噺
+ */
+ private Long quantity;
+
+ /**
+ * 鎬婚噾棰�
+ */
+ private BigDecimal grossAmount;
+
+ /**
+ * 瀹�
+ */
+ private BigDecimal width;
+
+ /**
+ * 楂�
+ */
+ private BigDecimal height;
+
+ /**
+ * 褰㈢姸
+ */
+ private String shape;
+
+ /**
+ * 瀹為檯闈㈢Н
+ */
+ private BigDecimal area;
+
+ /**
+ * 瀹為檯鎬婚潰绉�
+ */
+ private BigDecimal grossArea;
+
+ /**
+ * 缁撶畻鍗曠墖闈㈢Н
+ */
+ private BigDecimal computeArea;
+
+ /**
+ * 缁撶畻鎬婚潰绉�
+ */
+ private BigDecimal computeGrossArea;
+
+ /**
+ * 鍔犲伐瑕佹眰
+ */
+ private String processingNote;
+
+ /**
+ * 澶囨敞
+ */
+ private String remarks;
+
+ /**
+ * 寮挗寮у害
+ */
+ private Double bendRadius;
+
+ /**
+ * 纾ㄨ竟绫诲瀷
+ */
+ private String edgingType;
+
+ /**
+ * 鎷遍珮
+ */
+ private Double archRise;
+
+ /**
+ * 閲嶉噺
+ */
+ private String weight;
+
+ /**
+ * 鍛ㄩ暱
+ */
+ private String perimeter;
+
+ /**
+ * 鍏朵粬鍒�
+ */
+ private String otherColumns;
+
+ /**
+ * 鍏ュ簱鍙敤鏁伴噺
+ */
+ private Integer warehouseNum;
+
+ /**
+ * 鍙戣揣鏁伴噺
+ */
+ private Integer deliveryNum;
+
+ /**
+ * 閫�璐ф暟閲�
+ */
+ private Integer returnNum;
+
+ /**
+ * 鐘舵��
+ */
+ private Integer state;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java
new file mode 100644
index 0000000..dd6a8c2
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java
@@ -0,0 +1,16 @@
+package com.mes.orderdetail.mapper;
+
+import com.mes.orderdetail.entity.OrderDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-18
+ */
+public interface OrderDetailMapper extends BaseMapper<OrderDetail> {
+
+}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.xml b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml
similarity index 70%
copy from hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.xml
copy to hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml
index 9a0cd27..37b0072 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.xml
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml
@@ -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.mes.role.mapper.SysRoleMapper">
+<mapper namespace="com.mes.orderdetail.mapper.OrderDetailMapper">
</mapper>
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java
new file mode 100644
index 0000000..fc7039f
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java
@@ -0,0 +1,16 @@
+package com.mes.orderdetail.service;
+
+import com.mes.orderdetail.entity.OrderDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-18
+ */
+public interface OrderDetailService extends IService<OrderDetail> {
+
+}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java
new file mode 100644
index 0000000..4e08615
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java
@@ -0,0 +1,20 @@
+package com.mes.orderdetail.service.impl;
+
+import com.mes.orderdetail.entity.OrderDetail;
+import com.mes.orderdetail.mapper.OrderDetailMapper;
+import com.mes.orderdetail.service.OrderDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-18
+ */
+@Service
+public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, OrderDetail> implements OrderDetailService {
+
+}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt b/hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt
new file mode 100644
index 0000000..b4027f0
--- /dev/null
+++ b/hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt
@@ -0,0 +1,32 @@
+________ ________ ___ _____________ ____
+`MMMMMMMb. 68b `MMMMMMMb. `MMb dMM'`MMMMMMMMM 6MMMMb\
+ MM `Mb Y89 MM `Mb MMM. ,PMM MM \ 6M' `
+ MM MM ____ ___ MM MM _____ M`Mb d'MM MM MM
+ MM .M9 6MMMMb `MM MM .M9 6MMMMMb M YM. ,P MM MM , YM.
+ MMMMMMM( 6M' `Mb MM MMMMMMM( 6M' `Mb M `Mb d' MM MMMMMMM YMMMMb
+ MM `Mb MM MM MM MM `Mb MM MM M YM.P MM MM ` `Mb
+ MM MM MMMMMMMM MM MM MM MM MM M `Mb' MM MM MM
+ MM MM MM MM MM MM MM MM M YP MM MM MM
+ MM .M9 YM d9 MM MM .M9 YM. ,M9 68b M `' MM MM / L ,M9
+_MMMMMMM9' YMMMM9 _MM__MMMMMMM9' YMMMMM9 Y89 _M_ _MM__MMMMMMMMM MYMMMM9
+
+// _ooOoo_ //
+// o8888888o //
+// 88" . "88 //
+// (| ^_^ |) //
+// O\ = /O //
+// ____/`---'\____ //
+// .' \\| |// `. //
+// / \\||| : |||// \ //
+// / _||||| -:- |||||- \ //
+// | | \\\ - /// | | //
+// | \_| ''\---/'' | | //
+// \ .-\__ `-` ___/-. / //
+// ___`. .' /--.--\ `. . ___ //
+// ."" '< `.___\_<|>_/___.' >'"". //
+// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
+// \ \ `-. \_ __\ /__ _/ .-` / / //
+// ========`-.____`-.___\_____/___.-`____.-'======== //
+// `=---=' //
+// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
+// 浣涚淇濅綉 姘镐笉瀹曟満 姘告棤BUG 銆�銆�//
\ No newline at end of file
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index 9da0bc0..443bd66 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -15,6 +15,7 @@
<modules>
<module>servicebase</module>
<module>springsecurity</module>
+ <module>displayscreen</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.xml b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.xml
deleted file mode 100644
index af0749b..0000000
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.mes.role.mapper.SysRoleMenuMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml
index 9918e23..8182abe 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml
@@ -14,6 +14,11 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
+ sd:
+ url: jdbc:mysql://192.168.1.199:3306/pp?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index 66f9c31..1f47fa6 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -14,6 +14,11 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
+ sd:
+ url: jdbc:mysql://192.168.1.199:3306/pp?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
# hangzhoumes:
# url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
# username: root
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
index c372c41..d5eeae7 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
@@ -14,6 +14,11 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
+ sd:
+ url: jdbc:mysql://192.168.1.199:3306/pp?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
--
Gitblit v1.8.0