From 13c008aedf85c09ef8ac0c89a401a6a623b2c913 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 13 三月 2025 15:29:17 +0800
Subject: [PATCH] 添加集成模块
---
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/DetailedListVo.java | 11 ++
lxzn-module-system/lxzn-system-start/pom.xml | 8 +
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/MsiWebapiJsonMapper.java | 8 ++
lxzn-module-msi/pom.xml | 25 ++++++
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/entity/MsiWebapiJsonEntity.java | 46 +++++++++++
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/IMsiWebapiJsonService.java | 7 +
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/MachineEquipentInfo.java | 16 ++++
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/xml/MsiWebapiJsonMapper.fxml | 4 +
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/controller/MsiWebapiJsonController.java | 34 ++++++++
lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java | 20 ++++
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/impl/MsiWebapiJsonServiceImpl.java | 11 ++
pom.xml | 1
12 files changed, 187 insertions(+), 4 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
index e2c3bbe..59effd1 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
@@ -1,6 +1,5 @@
package org.jeecg.config;
-
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.constant.CommonConstant;
@@ -19,7 +18,6 @@
import springfox.documentation.builders.ParameterBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.oas.annotations.EnableOpenApi;
import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.*;
import springfox.documentation.spi.DocumentationType;
@@ -144,6 +142,24 @@
.groupName("Flowable妯″潡");
}
+ @Bean(value = "defaultApiMsi")
+ public Docket activitiApiMsi() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo())
+ .select()
+ //姝ゅ寘璺緞涓嬬殑绫伙紝鎵嶇敓鎴愭帴鍙ｆ枃妗�
+ .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.msi"))
+ //鍔犱簡ApiOperation娉ㄨВ鐨勭被锛屾墠鐢熸垚鎺ュ彛鏂囨。
+ .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .paths(PathSelectors.any())
+ .build()
+ .securitySchemes(Collections.singletonList(securityScheme()))
+ .securityContexts(securityContexts())
+ .globalOperationParameters(setHeaderToken())
+ .groupName("闆嗘垚");
+ }
+
/***
* oauth2閰嶇疆
* 闇�瑕佸鍔爏wagger鎺堟潈鍥炶皟鍦板潃
diff --git a/lxzn-module-msi/pom.xml b/lxzn-module-msi/pom.xml
new file mode 100644
index 0000000..b1227ed
--- /dev/null
+++ b/lxzn-module-msi/pom.xml
@@ -0,0 +1,25 @@
+<?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>lxzn-boot-parent</artifactId>
+ <groupId>org.jeecgframework.boot</groupId>
+ <version>3.4.3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>lxzn-module-msi</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>lxzn-boot-base-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>lxzn-system-biz</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/controller/MsiWebapiJsonController.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/controller/MsiWebapiJsonController.java
new file mode 100644
index 0000000..066eb1e
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/controller/MsiWebapiJsonController.java
@@ -0,0 +1,34 @@
+package org.jeecg.modules.msi.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.msi.entity.MsiWebapiJsonEntity;
+import org.jeecg.modules.msi.service.IMsiWebapiJsonService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Api(tags = "鑷姩鍖栫嚎鏁版嵁")
+@RestController
+@RequestMapping("/msi/webapi")
+public class MsiWebapiJsonController extends JeecgController<MsiWebapiJsonEntity, IMsiWebapiJsonService> {
+
+ @AutoLog(value = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹")
+ @ApiOperation(value = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹 ", notes = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹")
+ @PostMapping(value = "/receiveAutomation")
+ public void receiveSaveMsiWebApiJson(String data) {
+ MsiWebapiJsonEntity entity = new MsiWebapiJsonEntity();
+ if (StringUtils.isBlank(data)) {
+ return;
+ }
+ entity.setModuleType("MDC");
+ //鍚庣画杩涜鍏朵粬涓氬姟鍏宠仈
+ service.save(entity);
+ }
+
+}
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/entity/MsiWebapiJsonEntity.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/entity/MsiWebapiJsonEntity.java
new file mode 100644
index 0000000..b7cc28d
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/entity/MsiWebapiJsonEntity.java
@@ -0,0 +1,46 @@
+package org.jeecg.modules.msi.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("msi_webapi_json")
+@ApiModel(value = "瀛樺偍鎺ュ彛鍩虹鏁版嵁", description = "瀛樺偍鎺ュ彛鍩虹鏁版嵁")
+public class MsiWebapiJsonEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty("涓婚敭")
+ private String id ;
+ /** 妯″潡鍒嗙被 */
+ @ApiModelProperty(name = "妯″潡鍒嗙被",notes = "")
+ private String moduleType ;
+ /** json鍐呭 */
+ @ApiModelProperty(name = "json鍐呭",notes = "")
+ private String webapiInfo ;
+ /** 鏉ユ簮 */
+ @ApiModelProperty(name = "鏉ユ簮",notes = "")
+ private String sourceName ;
+ /** 鍒涘缓浜� */
+ @ApiModelProperty(name = "鍒涘缓浜�",notes = "")
+ private String createBy ;
+ /** 鍒涘缓鏃堕棿 */
+ @ApiModelProperty(name = "鍒涘缓鏃堕棿",notes = "")
+ private Date createTime ;
+ /** 鏇存柊浜� */
+ @ApiModelProperty(name = "鏇存柊浜�",notes = "")
+ private String updateBy ;
+ /** 鏇存柊鏃堕棿 */
+ @ApiModelProperty(name = "鏇存柊鏃堕棿",notes = "")
+ private Date updateTime;
+}
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/MsiWebapiJsonMapper.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/MsiWebapiJsonMapper.java
new file mode 100644
index 0000000..3250d0c
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/MsiWebapiJsonMapper.java
@@ -0,0 +1,8 @@
+package org.jeecg.modules.msi.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.msi.entity.MsiWebapiJsonEntity;
+
+public interface MsiWebapiJsonMapper extends BaseMapper<MsiWebapiJsonEntity> {
+}
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/xml/MsiWebapiJsonMapper.fxml b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/xml/MsiWebapiJsonMapper.fxml
new file mode 100644
index 0000000..cfdb996
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/mapper/xml/MsiWebapiJsonMapper.fxml
@@ -0,0 +1,4 @@
+<?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="org.jeecg.modules.msi.mapper.MsiWebapiJsonMapper">
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/IMsiWebapiJsonService.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/IMsiWebapiJsonService.java
new file mode 100644
index 0000000..f5978a0
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/IMsiWebapiJsonService.java
@@ -0,0 +1,7 @@
+package org.jeecg.modules.msi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.msi.entity.MsiWebapiJsonEntity;
+
+public interface IMsiWebapiJsonService extends IService<MsiWebapiJsonEntity> {
+}
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/impl/MsiWebapiJsonServiceImpl.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/impl/MsiWebapiJsonServiceImpl.java
new file mode 100644
index 0000000..18b6f20
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/service/impl/MsiWebapiJsonServiceImpl.java
@@ -0,0 +1,11 @@
+package org.jeecg.modules.msi.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.msi.entity.MsiWebapiJsonEntity;
+import org.jeecg.modules.msi.mapper.MsiWebapiJsonMapper;
+import org.jeecg.modules.msi.service.IMsiWebapiJsonService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MsiWebapiJsonServiceImpl extends ServiceImpl<MsiWebapiJsonMapper, MsiWebapiJsonEntity> implements IMsiWebapiJsonService {
+}
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/DetailedListVo.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/DetailedListVo.java
new file mode 100644
index 0000000..daf9b6b
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/DetailedListVo.java
@@ -0,0 +1,11 @@
+package org.jeecg.modules.msi.vo;
+
+import lombok.Data;
+
+@Data
+public class DetailedListVo {
+ private String itemName;
+ private String itemValue;
+ private String time;
+
+}
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/MachineEquipentInfo.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/MachineEquipentInfo.java
new file mode 100644
index 0000000..1f07c46
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/MachineEquipentInfo.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.msi.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MachineEquipentInfo {
+
+ private String machineNo;
+ private String itemCount;
+ private String beginTime;
+ private String endTime;
+ private List<DetailedListVo> itemList;
+
+}
diff --git a/lxzn-module-system/lxzn-system-start/pom.xml b/lxzn-module-system/lxzn-system-start/pom.xml
index 279bc7c..6cfe3bd 100644
--- a/lxzn-module-system/lxzn-system-start/pom.xml
+++ b/lxzn-module-system/lxzn-system-start/pom.xml
@@ -36,8 +36,12 @@
<artifactId>lxzn-module-flowable</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
-
-
+ <!--msi 妯″潡-->
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>lxzn-module-msi</artifactId>
+ <version>${jeecgboot.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index f2cf448..ea03698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@
<module>lxzn-module-mdc</module>
<module>lxzn-module-dnc</module>
<module>lxzn-module-flowable</module>
+ <module>lxzn-module-msi</module>
</modules>
<repositories>
--
Gitblit v1.9.3