hangzhoumesParent/common/displayscreen/pom.xml
New file @@ -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> hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java
New file @@ -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); // } }
New file @@ -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> { }
New file @@ -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 { // // //} hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java
New file @@ -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); } }
New file @@ -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; /** * 销售人员Id */ 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; /** * 审核人id */ private String verifierId; /** * 审核人 */ private String verifier; /** * 创建人id */ 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; } hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java
New file @@ -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> { } hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
File was renamed from hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.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> hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/OrderService.java
New file @@ -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); }
New file @@ -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(); } } hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java
New file @@ -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 { }
New file @@ -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; } hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java
New file @@ -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> { } hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xmlcopy 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
File was copied from hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMapper.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> hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java
New file @@ -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> { } hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java
New file @@ -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 { } hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt
New file @@ -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 // 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> hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.xml
File was deleted 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: 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 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:
