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é ç½® * éè¦å¢å swaggerææåè°å°å 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> 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); } } 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; } 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> { } 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> 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> { } 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 { } 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; } 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; } 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> 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>