CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

yanyang #20

Merged
yanyang merged 3 commits from yanyang into master 2023-06-25 16:36:43 +08:00
Conversation 0 Commits 3 Files Changed 17 +233 -155
27 changed files with 233 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9546ceec03 - Show all commits

57
ym-gateway/pom.xml
View File

@ -86,4 +86,61 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.12</version>
<configuration>
<!--指定运行main函数的包-->
<mainClass>com.cnbm.YmApplication</mainClass>
<!--开启分层编译支持-->
<layers>
<enabled>true</enabled>
<configuration>${project.basedir}/src/main/resources/layers.xml</configuration>
</layers>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.plugin.version}</version>
<configuration>
<imageName>ym-pass/${project.artifactId}</imageName>
<dockerDirectory>${project.basedir}/</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

4
ym-gateway/src/main/java/com/cnbm/config/SwaggerConfig.java
View File

@ -21,14 +21,11 @@ import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider; import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.google.common.collect.Lists.newArrayList;
/** /**
* @Author weihongyang * @Author weihongyang
* @Date 2022/6/21 10:56 AM * @Date 2022/6/21 10:56 AM
@ -128,6 +125,7 @@ public class SwaggerConfig {
.securitySchemes(Arrays.asList(new ApiKey("token", "token", "header"))); .securitySchemes(Arrays.asList(new ApiKey("token", "token", "header")));
} }
@Bean @Bean
public Docket processInspectionApi() { public Docket processInspectionApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)

6
ym-gateway/src/main/resources/application.yml
View File

@ -33,9 +33,9 @@ spring:
enabled: true enabled: true
redis: redis:
database: 2 database: 2
host: redis.picaiba.com host: 127.0.0.1
port: 6380 port: 6379
password: '@WSXcde3' # 密码（默认为空） password: '' # 密码（默认为空）
timeout: 6000ms # 连接超时时长（毫秒） timeout: 6000ms # 连接超时时长（毫秒）
jedis: jedis:
pool: pool:

27
ym-gateway/src/main/resources/layers.xml Normal file
View File

@ -0,0 +1,27 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/boot/layers/layers.xsd">
<application>
<into layer="spring-boot-loader">
<include>org/springframework/boot/loader/**</include>
</into>
<into layer="application" />
</application>
<dependencies>
<into layer="snapshot-dependencies">
<include>*:*:*SNAPSHOT</include>
</into>
<into layer="company-dependencies">
<include>com.cnbm:*</include>
</into>
<into layer="dependencies"/>
</dependencies>
<layerOrder>
<layer>dependencies</layer>
<layer>spring-boot-loader</layer>
<layer>snapshot-dependencies</layer>
<layer>company-dependencies</layer>
<layer>application</layer>
</layerOrder>
</layers>

2
ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
View File

@ -19,7 +19,7 @@ public class CodeGenerator {
@Test @Test
public void test(){ public void test(){
mybatisPlusGenerator(new String[]{"inspection_sheet"}); mybatisPlusGenerator(new String[]{"unit"});
} }
public static void mybatisPlusGenerator(String[] include){ public static void mybatisPlusGenerator(String[] include){

9
ym-generator/src/main/java/com/cnbm/generator/code/controller/InspectionSheetController.java
View File

@ -51,7 +51,6 @@ public class InspectionSheetController {
@PreAuthorize("@ex.hasAuthority('code:inspectionSheet:page')") @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:page')")
public Result<PageData<InspectionSheetDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){ public Result<PageData<InspectionSheetDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<InspectionSheetDTO> page = inspectionSheetService.page(params); PageData<InspectionSheetDTO> page = inspectionSheetService.page(params);
return new Result<PageData<InspectionSheetDTO>>().ok(page); return new Result<PageData<InspectionSheetDTO>>().ok(page);
} }
@ -60,7 +59,6 @@ public class InspectionSheetController {
@PreAuthorize("@ex.hasAuthority('code:inspectionSheet:info')") @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:info')")
public Result<InspectionSheetDTO> get(@PathVariable("id") Long id){ public Result<InspectionSheetDTO> get(@PathVariable("id") Long id){
InspectionSheetDTO data = inspectionSheetService.get(id); InspectionSheetDTO data = inspectionSheetService.get(id);
return new Result<InspectionSheetDTO>().ok(data); return new Result<InspectionSheetDTO>().ok(data);
} }
@ -71,7 +69,6 @@ public class InspectionSheetController {
public Result<Long> save(@RequestBody InspectionSheetDTO dto){ public Result<Long> save(@RequestBody InspectionSheetDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
try { try {
inspectionSheetService.save(dto); inspectionSheetService.save(dto);
}catch (Exception e){ }catch (Exception e){
@ -86,9 +83,7 @@ public class InspectionSheetController {
public Result<Long> update(@RequestBody InspectionSheetDTO dto){ public Result<Long> update(@RequestBody InspectionSheetDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
inspectionSheetService.update(dto); inspectionSheetService.update(dto);
return new Result<Long>().ok(dto.getId()); return new Result<Long>().ok(dto.getId());
} }
@ -99,9 +94,7 @@ public class InspectionSheetController {
public Result delete(@RequestBody Long[] ids){ public Result delete(@RequestBody Long[] ids){
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");
inspectionSheetService.delete(ids); inspectionSheetService.delete(ids);
return new Result(); return new Result();
} }
@ -111,8 +104,6 @@ public class InspectionSheetController {
@PreAuthorize("@ex.hasAuthority('code:inspectionSheet:export')") @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<InspectionSheetDTO> list = inspectionSheetService.list(params); List<InspectionSheetDTO> list = inspectionSheetService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, InspectionSheetExcel.class); ExcelUtils.exportExcelToTarget(response, null, list, InspectionSheetExcel.class);
} }
} }

10
ym-generator/src/main/java/com/cnbm/generator/code/controller/UnitController.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
* 单位 表 前端控制器 * 单位 表 前端控制器
* *
* @author why * @author why
* @since 2022-06-30 * @since 2023-01-12
*/ */
@RestController @RestController
@RequestMapping("/code/unit") @RequestMapping("/code/unit")
@ -68,26 +68,26 @@ public class UnitController {
@ApiOperation("保存") @ApiOperation("保存")
@LogOperation("保存") @LogOperation("保存")
@PreAuthorize("@ex.hasAuthority('code:unit:save')") @PreAuthorize("@ex.hasAuthority('code:unit:save')")
public Result save(@RequestBody UnitDTO dto){ public Result<Long> save(@RequestBody UnitDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
unitService.save(dto); unitService.save(dto);
return new Result(); return new Result<Long>().ok(dto.getId());
} }
@PutMapping @PutMapping
@ApiOperation("修改") @ApiOperation("修改")
@LogOperation("修改") @LogOperation("修改")
@PreAuthorize("@ex.hasAuthority('code:unit:update')") @PreAuthorize("@ex.hasAuthority('code:unit:update')")
public Result update(@RequestBody UnitDTO dto){ public Result<Long> update(@RequestBody UnitDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
unitService.update(dto); unitService.update(dto);
return new Result(); return new Result<Long>().ok(dto.getId());
} }
@DeleteMapping @DeleteMapping

22
ym-generator/src/main/java/com/cnbm/generator/code/dto/UnitDTO.java
View File

@ -14,7 +14,7 @@ import java.math.BigDecimal;
* 单位 表 * 单位 表
* *
* @author why * @author why
* @since 2022-06-30 * @since 2023-01-12
*/ */
@Data @Data
@ApiModel(value = "单位 表DTO对象") @ApiModel(value = "单位 表DTO对象")
@ -23,8 +23,8 @@ public class UnitDTO implements Serializable {
@ApiModelProperty(value = "ID") @ApiModelProperty(value = "")
private BigDecimal id; private Long id;
@ApiModelProperty(value = "单位 名") @ApiModelProperty(value = "单位 名")
private String name; private String name;
@ -33,19 +33,19 @@ public class UnitDTO implements Serializable {
private String code; private String code;
@ApiModelProperty(value = "单位类型，1 可计数，2 不可计数") @ApiModelProperty(value = "单位类型，1 可计数，2 不可计数")
private BigDecimal type; private Integer type;
@ApiModelProperty(value = "1 可用，0 不可用") @ApiModelProperty(value = "1 可用，0 不可用")
private BigDecimal status; private Integer status;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid; private Integer valid;
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "")
private BigDecimal creatorId; private Long creatorId;
@ApiModelProperty(value = "创建人姓名") @ApiModelProperty(value = "创建人姓名")
private String creatorName; private String creatorName;
@ -53,8 +53,8 @@ public class UnitDTO implements Serializable {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "")
private BigDecimal updaterId; private Long updaterId;
@ApiModelProperty(value = "更新人姓名") @ApiModelProperty(value = "更新人姓名")
private String updaterName; private String updaterName;
@ -63,6 +63,6 @@ public class UnitDTO implements Serializable {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号") @ApiModelProperty(value = "版本号")
private BigDecimal version; private Integer version;
} }

22
ym-generator/src/main/java/com/cnbm/generator/code/entity/Unit.java
View File

@ -1,7 +1,7 @@
package com.cnbm.generator.code.entity; package com.cnbm.generator.code.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -13,7 +13,7 @@ import lombok.Data;
* </p> * </p>
* *
* @author why * @author why
* @since 2022-06-30 * @since 2023-01-12
*/ */
@Data @Data
@ApiModel(value = "Unit对象", description = "单位 表") @ApiModel(value = "Unit对象", description = "单位 表")
@ -21,8 +21,7 @@ public class Unit implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") private Long id;
private BigDecimal id;
@ApiModelProperty("单位 名") @ApiModelProperty("单位 名")
private String name; private String name;
@ -31,19 +30,19 @@ public class Unit implements Serializable {
private String code; private String code;
@ApiModelProperty("单位类型，1 可计数，2 不可计数") @ApiModelProperty("单位类型，1 可计数，2 不可计数")
private BigDecimal type; private Integer type;
@ApiModelProperty("1 可用，0 不可用") @ApiModelProperty("1 可用，0 不可用")
private BigDecimal status; private Integer status;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用") @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid; @TableLogic
private Integer valid;
@ApiModelProperty("创建人") private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名") @ApiModelProperty("创建人姓名")
private String creatorName; private String creatorName;
@ -51,8 +50,7 @@ public class Unit implements Serializable {
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty("更新人") private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名") @ApiModelProperty("更新人姓名")
private String updaterName; private String updaterName;
@ -61,7 +59,7 @@ public class Unit implements Serializable {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@ApiModelProperty("版本号") @ApiModelProperty("版本号")
private BigDecimal version; private Integer version;
} }

22
ym-generator/src/main/java/com/cnbm/generator/code/excel/UnitExcel.java
View File

@ -12,37 +12,37 @@ import java.util.Date;
* 单位 表 * 单位 表
* *
* @author why * @author why
* @since 2022-06-30 * @since 2023-01-12
*/ */
@Data @Data
public class UnitExcel { public class UnitExcel {
@Excel(name = "ID") @Excel(name = "")
private BigDecimal id; private Long id;
@Excel(name = "单位 名") @Excel(name = "单位 名")
private String name; private String name;
@Excel(name = "单位 编码") @Excel(name = "单位 编码")
private String code; private String code;
@Excel(name = "单位类型，1 可计数，2 不可计数") @Excel(name = "单位类型，1 可计数，2 不可计数")
private BigDecimal type; private Integer type;
@Excel(name = "1 可用，0 不可用") @Excel(name = "1 可用，0 不可用")
private BigDecimal status; private Integer status;
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用") @Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid; private Integer valid;
@Excel(name = "创建人") @Excel(name = "")
private BigDecimal creatorId; private Long creatorId;
@Excel(name = "创建人姓名") @Excel(name = "创建人姓名")
private String creatorName; private String creatorName;
@Excel(name = "创建时间") @Excel(name = "创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@Excel(name = "更新人") @Excel(name = "")
private BigDecimal updaterId; private Long updaterId;
@Excel(name = "更新人姓名") @Excel(name = "更新人姓名")
private String updaterName; private String updaterName;
@Excel(name = "更新时间") @Excel(name = "更新时间")
private LocalDateTime updateTime; private LocalDateTime updateTime;
@Excel(name = "版本号") @Excel(name = "版本号")
private BigDecimal version; private Integer version;
} }

2
ym-generator/src/main/java/com/cnbm/generator/code/mapper/UnitMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
* 单位 表 * 单位 表
* *
* @author why * @author why
* @since 2022-06-30 * @since 2023-01-12
*/ */
@Mapper @Mapper
public interface UnitMapper extends BaseDao<Unit> { public interface UnitMapper extends BaseDao<Unit> {

16
ym-generator/src/main/java/com/cnbm/generator/code/mapper/UnitMapper.xml
View File

@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cnbm.generator.code.mapper.UnitMapper"> <mapper namespace="com.cnbm.generator.code.mapper.UnitMapper">
<resultMap type="com.cnbm.generator.code.entity.Unit" id="UnitMap">
<id column="id" property="id" />
<id column="name" property="name" />
<id column="code" property="code" />
<id column="type" property="type" />
<id column="status" property="status" />
<id column="remark" property="remark" />
<id column="valid" property="valid" />
<id column="creator_id" property="creatorId" />
<id column="creator_name" property="creatorName" />
<id column="create_time" property="createTime" />
<id column="updater_id" property="updaterId" />
<id column="updater_name" property="updaterName" />
<id column="update_time" property="updateTime" />
<id column="version" property="version" />
</resultMap>
</mapper> </mapper>

2
ym-generator/src/main/java/com/cnbm/generator/code/service/IUnitService.java
View File

@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.Unit;
* 单位 表 * 单位 表
* *
* @author why * @author why
* @since 2022-06-30 * @since 2023-01-12
*/ */
public interface IUnitService extends CrudService<Unit, UnitDTO> { public interface IUnitService extends CrudService<Unit, UnitDTO> {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/impl/UnitServiceImpl.java
View File

@ -15,7 +15,7 @@ import java.util.Map;
* 单位 表 * 单位 表
* *
* @author why * @author why
* @since 2022-06-30 * @since 2023-01-12
*/ */
@Service @Service
public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO> implements IUnitService { public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO> implements IUnitService {

74
ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java
View File

@ -99,7 +99,6 @@ public enum InfluxClient {
.time(event.getTime().toEpochMilli(), WritePrecision.MS); .time(event.getTime().toEpochMilli(), WritePrecision.MS);
} }
writeApi.writePoint(point); writeApi.writePoint(point);
} }
/** /**
@ -120,7 +119,7 @@ public enum InfluxClient {
}else { }else {
point = Point.measurement(measurement) point = Point.measurement(measurement)
.addTag("transationId", event.getTransationId()==null ? "" : event.getTransationId()) .addTag("transationId", event.getTransationId()==null ? "" : event.getTransationId())
.addTag("inspectionSheetId", event.getInspectionSheetId()) .addTag("inspectionSheetId", event.getInspectionSheetId()==null ? "" : event.getInspectionSheetId())
// .addTag("batchNum", event.getBatchNum()) // .addTag("batchNum", event.getBatchNum())
.addTag("sampleNumber", event.getSampleNumber()) .addTag("sampleNumber", event.getSampleNumber())
@ -181,43 +180,44 @@ public enum InfluxClient {
return queryApi.query(flux); return queryApi.query(flux);
} }
public List<FluxTable> queryByGroup(QueryDataParam param){
String measurement = param.getMeasurement();
List<String> dropedTagNames = param.getDropedTagNames();
Range range = param.getRange();
String bucket = param.getBucket();
// public List<FluxTable> queryByGroup(QueryDataParam param){
// String measurement = param.getMeasurement();
String groupName = param.getGroupName(); // List<String> dropedTagNames = param.getDropedTagNames();
PageInfo pageInfo = param.getPageInfo(); // Range range = param.getRange();
// String bucket = param.getBucket();
String flux = "from(bucket:\""+bucket+"\")"; //
flux += "|> range(start: "+range.getBegin()+",stop:"+range.getEnd()+")"; //
flux += "|> filter(fn: (r) => r[\"_measurement\"] == \""+measurement+"\")"; //
// String groupName = param.getGroupName();
// String tagName = param.getTag().getTagName(); // PageInfo pageInfo = param.getPageInfo();
// String tagValue = param.getTag().getTagValue(); //
// String flux = "from(bucket:\""+bucket+"\")";
// flux += "|> range(start: "+range.getBegin()+",stop:"+range.getEnd()+")";
// flux += "|> filter(fn: (r) => r[\"_measurement\"] == \""+measurement+"\")";
//
//// String tagName = param.getTag().getTagName();
//// String tagValue = param.getTag().getTagValue();
//// flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\")";
// if(param.getTags()!=null && param.getTags().size()>0){
// for(Tag tag:param.getTags()){
// String tagName = tag.getTagName();
// String tagValue = tag.getTagValue();
// flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\")"; // flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\")";
if(param.getTags()!=null && param.getTags().size()>0){ // }
for(Tag tag:param.getTags()){ // }
String tagName = tag.getTagName(); //
String tagValue = tag.getTagValue(); //// flux += "|> timeShift(duration: 8h)";
flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\")"; // flux += "|> group(columns: [\""+groupName+"\"], mode: \"except\")";
} // for(String dropName:dropedTagNames){
} // flux += "|> drop(columns: [\""+dropName+"\"])";
// }
// flux += "|> timeShift(duration: 8h)"; // flux += "|> sort(columns: [\"_time\"], desc: true)";
flux += "|> group(columns: [\""+groupName+"\"], mode: \"except\")"; // if(pageInfo!=null){
for(String dropName:dropedTagNames){ // flux += "|> limit(n: "+pageInfo.getSize()+", offset: "+(pageInfo.getCurrent()-1)* pageInfo.getSize()+")";
flux += "|> drop(columns: [\""+dropName+"\"])"; // }
} // return queryApi.query(flux);
flux += "|> sort(columns: [\"_time\"], desc: true)"; // }
if(pageInfo!=null){
flux += "|> limit(n: "+pageInfo.getSize()+", offset: "+(pageInfo.getCurrent()-1)* pageInfo.getSize()+")";
}
return queryApi.query(flux);
}
public List<FluxTable> queryGroupByTime(QueryDataGroupByTimeParam param){ public List<FluxTable> queryGroupByTime(QueryDataGroupByTimeParam param){
String measurement = param.getMeasurement(); String measurement = param.getMeasurement();

29
ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java
View File

@ -63,10 +63,9 @@ public class S7DemoController {
} }
@PostMapping("/insertDemoOne") @PostMapping("/insertDemoOne")
public void insertDemoOne() throws InterruptedException { public void insertDemoOne(){
List<Event> list = new ArrayList<>(); List<Event> list = new ArrayList<>();
Event event = new Event(); Event event = new Event();
event.setTime(new Date(1670554110451L).toInstant()); event.setTime(new Date(1670554110451L).toInstant());
event.setArgName("failDayDay"); event.setArgName("failDayDay");
@ -81,22 +80,9 @@ public class S7DemoController {
event2.setSampleNumber("10001"); event2.setSampleNumber("10001");
list.add(event2); list.add(event2);
InfluxClient.Client.batchInsert(list,"Weight"); InfluxClient.Client.batchInsert(list,"Weight");
// Thread.sleep(10000);
//
// List<Event> list2 = new ArrayList<>();
// Event event2 = new Event();
// event2.setTime(time);
//
// event2.setArgName("failDayDay");
// event2.setArgValue("20087");
// event2.setSampleNumber("10001");
// list2.add(event2);
//
// InfluxClient.Client.batchInsert(list2,"Weight");
} }
@PostMapping("/readDemoOne") @PostMapping("/readDemoOne")
public void readDemoOne() throws InterruptedException { public void readDemoOne() {
List<String> dropNames = new ArrayList<>(); List<String> dropNames = new ArrayList<>();
dropNames.add("transationId"); dropNames.add("transationId");
// dropNames.add("inspectionSheetId"); // dropNames.add("inspectionSheetId");
@ -114,7 +100,7 @@ public class S7DemoController {
} }
@PostMapping("/getFlux") @PostMapping("/getFlux")
public Result<Instant> getFlux() throws InterruptedException { public Result<Instant> getFlux() {
List<String> dropNames = new ArrayList<>(); List<String> dropNames = new ArrayList<>();
dropNames.add("transationId"); dropNames.add("transationId");
dropNames.add("inspectionSheetId"); dropNames.add("inspectionSheetId");
@ -133,7 +119,7 @@ public class S7DemoController {
} }
@PostMapping("/saveFlux1") @PostMapping("/saveFlux1")
public Result<Instant> saveFlux1() throws InterruptedException { public Result<Instant> saveFlux1() {
List<Event> list = new ArrayList<>(); List<Event> list = new ArrayList<>();
Event event2 = new Event(); Event event2 = new Event();
@ -146,8 +132,9 @@ public class S7DemoController {
InfluxClient.Client.batchInsert(list,"Weight"); InfluxClient.Client.batchInsert(list,"Weight");
return new Result<Instant>().ok(instant); return new Result<Instant>().ok(instant);
} }
@PostMapping("/saveFlux2") @PostMapping("/saveFlux2")
public void saveFlux2(@RequestBody TIMETest timeTest) throws InterruptedException { public void saveFlux2(@RequestBody TIMETest timeTest) {
List<Event> list = new ArrayList<>(); List<Event> list = new ArrayList<>();
Event event2 = new Event(); Event event2 = new Event();
@ -209,7 +196,7 @@ public class S7DemoController {
// public void insertAndQuery() throws InterruptedException { // public void insertAndQuery() throws InterruptedException {
// Event event = new Event(); // Event event = new Event();
// //
//// long l = System.currentTimeMillis(); // long l = System.currentTimeMillis();
//// System.out.println("l:"+l); //// System.out.println("l:"+l);
//// event.setTime(new Date(1669874900889l).toInstant()); //// event.setTime(new Date(1669874900889l).toInstant());
//// ////

11
ym-influx/src/main/java/com/cnbm/influx/controller/SPCController.java
View File

@ -1,13 +1,9 @@
package com.cnbm.influx.controller; package com.cnbm.influx.controller;
import com.cnbm.common.spc.util.DataUtils;
import com.cnbm.common.utils.Result; import com.cnbm.common.utils.Result;
import com.cnbm.influx.config.InfluxClient; import com.cnbm.influx.config.InfluxClient;
import com.cnbm.influx.constant.Constant;
import com.cnbm.influx.param.QueryDataParam; import com.cnbm.influx.param.QueryDataParam;
import com.cnbm.influx.param.Range;
import com.cnbm.influx.param.Tag;
import com.cnbm.influx.template.Event;
import com.influxdb.query.FluxTable; import com.influxdb.query.FluxTable;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -15,8 +11,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.time.Instant;
import java.util.*; import java.util.*;
@RestController @RestController
@ -24,9 +18,8 @@ import java.util.*;
public class SPCController { public class SPCController {
private static final Logger logger = LoggerFactory.getLogger(SPCController.class); private static final Logger logger = LoggerFactory.getLogger(SPCController.class);
@PostMapping("/getData") @PostMapping("/getData")
public Result getData(@RequestBody QueryDataParam param) throws InterruptedException { public Result getData(@RequestBody QueryDataParam param){
List<FluxTable> query = InfluxClient.Client.query(param); List<FluxTable> query = InfluxClient.Client.query(param);
return new Result<List<FluxTable>>().ok(query); return new Result<List<FluxTable>>().ok(query);
} }

3
ym-influx/src/main/java/com/cnbm/influx/param/PageInfo.java
View File

@ -21,4 +21,7 @@ public class PageInfo {
this.current = current; this.current = current;
this.size = size; this.size = size;
} }
public PageInfo() {
}
} }

4
ym-influx/src/main/java/com/cnbm/influx/param/QueryDataParam.java
View File

@ -31,7 +31,9 @@ public class QueryDataParam extends BaseParam{
//查询的时候，需要忽略的字段。(transationId是唯一标识会对 最终的查询结果集产生影响) //查询的时候，需要忽略的字段。(transationId是唯一标识会对 最终的查询结果集产生影响)
private List<String> dropedTagNames; private List<String> dropedTagNames;
private String bucket; private String bucket;
private String groupName;
//private String inspectionSheetId; //private String inspectionSheetId;
public QueryDataParam() {
}
} }

2
ym-influx/src/main/java/com/cnbm/influx/param/Range.java
View File

@ -23,6 +23,8 @@ public class Range {
this.end = end; this.end = end;
} }
public Range() {
}
// public static void main(String[] args) { // public static void main(String[] args) {
// Date date = new Date(); // Date date = new Date();
// System.out.println(date.toInstant().toString()); // System.out.println(date.toInstant().toString());

3
ym-influx/src/main/java/com/cnbm/influx/param/Tag.java
View File

@ -16,4 +16,7 @@ public class Tag {
this.tagName = tagName; this.tagName = tagName;
this.tagValue = tagValue; this.tagValue = tagValue;
} }
public Tag() {
}
} }

8
ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java
View File

@ -13,8 +13,6 @@ import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup; import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup; import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.common.validator.group.UpdateGroup; import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.processInspection.dto.InspectionSampleDTO; import com.cnbm.processInspection.dto.InspectionSampleDTO;
import com.cnbm.processInspection.dto.InspectionSampleDTO2; import com.cnbm.processInspection.dto.InspectionSampleDTO2;
import com.cnbm.processInspection.dto.InspectionSampleDTO3; import com.cnbm.processInspection.dto.InspectionSampleDTO3;
@ -22,7 +20,6 @@ import com.cnbm.processInspection.dto.InspectionSheetDTO;
import com.cnbm.processInspection.entity.InspectionSheet; import com.cnbm.processInspection.entity.InspectionSheet;
import com.cnbm.processInspection.excel.InspectionSheetExcel; import com.cnbm.processInspection.excel.InspectionSheetExcel;
import com.cnbm.processInspection.service.IInspectionSheetService; import com.cnbm.processInspection.service.IInspectionSheetService;
import com.influxdb.query.FluxTable;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -71,7 +68,6 @@ public class InspectionSheetController {
@PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:page')") @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:page')")
public Result<PageData<InspectionSheetDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){ public Result<PageData<InspectionSheetDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<InspectionSheetDTO> page = inspectionSheetService.page(params); PageData<InspectionSheetDTO> page = inspectionSheetService.page(params);
return new Result<PageData<InspectionSheetDTO>>().ok(page); return new Result<PageData<InspectionSheetDTO>>().ok(page);
} }
@ -80,7 +76,6 @@ public class InspectionSheetController {
@PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:info')") @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:info')")
public Result<InspectionSheetDTO> get(@PathVariable("id") Long id){ public Result<InspectionSheetDTO> get(@PathVariable("id") Long id){
InspectionSheetDTO data = inspectionSheetService.get(id); InspectionSheetDTO data = inspectionSheetService.get(id);
return new Result<InspectionSheetDTO>().ok(data); return new Result<InspectionSheetDTO>().ok(data);
} }
@ -91,7 +86,6 @@ public class InspectionSheetController {
public Result<Long> save(@RequestBody InspectionSheetDTO dto){ public Result<Long> save(@RequestBody InspectionSheetDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
// try { // try {
// inspectionSheetService.saveSheet(dto); // inspectionSheetService.saveSheet(dto);
// }catch (Exception e){ // }catch (Exception e){
@ -195,7 +189,6 @@ public class InspectionSheetController {
@PostMapping("saveFluxParamList2") @PostMapping("saveFluxParamList2")
@ApiOperation("将样本检测参数写入influxdb2") @ApiOperation("将样本检测参数写入influxdb2")
public Result saveFluxParamList2(@RequestBody InspectionSampleDTO2[] lists) throws InterruptedException{ public Result saveFluxParamList2(@RequestBody InspectionSampleDTO2[] lists) throws InterruptedException{
inspectionSheetService.saveFluxParamList2(lists); inspectionSheetService.saveFluxParamList2(lists);
Thread.sleep(1000); Thread.sleep(1000);
//样本数据更新后 计算检验单缺陷数不良数 //样本数据更新后 计算检验单缺陷数不良数
@ -206,7 +199,6 @@ public class InspectionSheetController {
@PostMapping("saveFluxParamList3") @PostMapping("saveFluxParamList3")
@ApiOperation("将样本检测参数写入influxdb3") @ApiOperation("将样本检测参数写入influxdb3")
public Result saveFluxParamList3(@RequestBody InspectionSampleDTO3[] lists) throws InterruptedException{ public Result saveFluxParamList3(@RequestBody InspectionSampleDTO3[] lists) throws InterruptedException{
inspectionSheetService.saveFluxParamList3(lists); inspectionSheetService.saveFluxParamList3(lists);
Thread.sleep(1000); Thread.sleep(1000);
//样本数据更新后 计算检验单缺陷数不良数 //样本数据更新后 计算检验单缺陷数不良数

31
ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java
View File

@ -6,13 +6,10 @@ import com.cnbm.basic.service.IProductFeaturesService;
import com.cnbm.common.spc.math.StandardDiviation; import com.cnbm.common.spc.math.StandardDiviation;
import com.cnbm.common.spc.util.DataUtils; import com.cnbm.common.spc.util.DataUtils;
import com.cnbm.common.vo.R; import com.cnbm.common.vo.R;
import com.cnbm.influx.config.InfluxClient;
import com.cnbm.influx.constant.Constant; import com.cnbm.influx.constant.Constant;
import com.cnbm.influx.param.QueryDataGroupByTimeParam; import com.cnbm.influx.param.QueryDataGroupByTimeParam;
import com.cnbm.influx.param.QueryDataParam; import com.cnbm.influx.param.QueryDataParam;
import com.cnbm.influx.param.Range; import com.cnbm.influx.param.Range;
import com.cnbm.influx.param.Tag;
import com.cnbm.influx.template.Event;
import com.cnbm.processInspection.dto.*; import com.cnbm.processInspection.dto.*;
import com.cnbm.processInspection.graphAnalyzed.forCount.c.CGraph; import com.cnbm.processInspection.graphAnalyzed.forCount.c.CGraph;
import com.cnbm.processInspection.graphAnalyzed.forCount.np.NPGraph; import com.cnbm.processInspection.graphAnalyzed.forCount.np.NPGraph;
@ -22,8 +19,6 @@ import com.cnbm.processInspection.graphAnalyzed.forMeterage.mr.MeanRGraph;
import com.cnbm.processInspection.graphAnalyzed.forMeterage.ms.MeanStandardDeviationGraph; import com.cnbm.processInspection.graphAnalyzed.forMeterage.ms.MeanStandardDeviationGraph;
import com.cnbm.processInspection.graphAnalyzed.forMeterage.xmr.XMRGraph; import com.cnbm.processInspection.graphAnalyzed.forMeterage.xmr.XMRGraph;
import com.cnbm.qualityPlanning.entity.ControlLimitDetail; import com.cnbm.qualityPlanning.entity.ControlLimitDetail;
import com.influxdb.query.FluxRecord;
import com.influxdb.query.FluxTable;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -32,12 +27,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random;
@RestController @RestController
@RequestMapping("/processInspection") @RequestMapping("/processInspection")
@ -227,7 +218,8 @@ public class ProcessInspectionController {
NPGraph npGraph = new NPGraph(productFeatures); NPGraph npGraph = new NPGraph(productFeatures);
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
queryDataParam.setMeasurement(Constant.measurement); // queryDataParam.setMeasurement(Constant.measurement);
queryDataParam.setMeasurement(graphArg.getProcedureName());
queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() )); queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
queryDataParam.setTimeType(graphArg.getGroupType()); queryDataParam.setTimeType(graphArg.getGroupType());
npGraph.initialDate(queryDataParam); npGraph.initialDate(queryDataParam);
@ -354,7 +346,8 @@ public class ProcessInspectionController {
meanStandardDeviationGraph.isNeedInterpretation(graphArg.getInterpretationScheme()); meanStandardDeviationGraph.isNeedInterpretation(graphArg.getInterpretationScheme());
} }
QueryDataParam queryDataParam = new QueryDataParam(); QueryDataParam queryDataParam = new QueryDataParam();
queryDataParam.setMeasurement(Constant.measurement); // queryDataParam.setMeasurement(Constant.measurement);
queryDataParam.setMeasurement(graphArg.getProcedureName());
queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant())); queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
meanStandardDeviationGraph.initialDate(queryDataParam); meanStandardDeviationGraph.initialDate(queryDataParam);
@ -389,7 +382,9 @@ public class ProcessInspectionController {
} }
QueryDataParam queryDataParam = new QueryDataParam(); QueryDataParam queryDataParam = new QueryDataParam();
queryDataParam.setMeasurement(Constant.measurement); // queryDataParam.setMeasurement(Constant.measurement);
queryDataParam.setMeasurement(graphArg.getProcedureName());
queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant())); queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
meanRGraph.initialDate(queryDataParam); meanRGraph.initialDate(queryDataParam);
@ -424,7 +419,8 @@ public class ProcessInspectionController {
} }
QueryDataParam queryDataParam = new QueryDataParam(); QueryDataParam queryDataParam = new QueryDataParam();
queryDataParam.setMeasurement(Constant.measurement); // queryDataParam.setMeasurement(Constant.measurement);
queryDataParam.setMeasurement(graphArg.getProcedureName());
queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant())); queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
xmrGraph.initialDate(queryDataParam); xmrGraph.initialDate(queryDataParam);
@ -453,7 +449,8 @@ public class ProcessInspectionController {
PGraph pGraph = new PGraph(productFeatures); PGraph pGraph = new PGraph(productFeatures);
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
queryDataParam.setMeasurement(Constant.measurement); // queryDataParam.setMeasurement(Constant.measurement);
queryDataParam.setMeasurement(graphArg.getProcedureName());
queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() )); queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
queryDataParam.setTimeType(graphArg.getGroupType()); queryDataParam.setTimeType(graphArg.getGroupType());
pGraph.initialDate(queryDataParam); pGraph.initialDate(queryDataParam);
@ -474,7 +471,8 @@ public class ProcessInspectionController {
CGraph cGraph = new CGraph(productFeatures); CGraph cGraph = new CGraph(productFeatures);
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
queryDataParam.setMeasurement(Constant.measurement); // queryDataParam.setMeasurement(Constant.measurement);
queryDataParam.setMeasurement(graphArg.getProcedureName());
queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() )); queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
queryDataParam.setTimeType(graphArg.getGroupType()); queryDataParam.setTimeType(graphArg.getGroupType());
cGraph.initialDate(queryDataParam); cGraph.initialDate(queryDataParam);
@ -496,7 +494,8 @@ public class ProcessInspectionController {
UGraph uGraph = new UGraph(productFeatures); UGraph uGraph = new UGraph(productFeatures);
QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam(); QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
queryDataParam.setMeasurement(Constant.measurement); // queryDataParam.setMeasurement(Constant.measurement);
queryDataParam.setMeasurement(graphArg.getProcedureName());
queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() )); queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
queryDataParam.setTimeType(graphArg.getGroupType()); queryDataParam.setTimeType(graphArg.getGroupType());
uGraph.initialDate(queryDataParam); uGraph.initialDate(queryDataParam);

3
ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java
View File

@ -41,4 +41,7 @@ public class GraphArg {
@ApiModelProperty(value = "分组类别（1=年 , 2=月 , 3=日）(用于计数型控制图)") @ApiModelProperty(value = "分组类别（1=年 , 2=月 , 3=日）(用于计数型控制图)")
private Integer groupType; private Integer groupType;
@ApiModelProperty(value = "工序名")
private String procedureName;
} }

2
ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forCount/np/NPGraph.java
View File

@ -86,6 +86,8 @@ public class NPGraph {
return totalFailNum/totalN; return totalFailNum/totalN;
} }
/** /**
* name : 初始化数据函数 * name : 初始化数据函数
* desc : 从influxdb 里面读取数据，然后 加工处理成 我需要的 * desc : 从influxdb 里面读取数据，然后 加工处理成 我需要的

7
ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forMeterage/mr/MeanRGraph.java
View File

@ -116,7 +116,12 @@ public class MeanRGraph {
List<FluxRecord> records = fluxTable.getRecords(); List<FluxRecord> records = fluxTable.getRecords();
for (FluxRecord fluxRecord : records) { for (FluxRecord fluxRecord : records) {
//因为 传进去的就是Double 类型，所以取出来，自然而然就是Double //因为 传进去的就是Double 类型，所以取出来，自然而然就是Double
originData.add(Double.parseDouble(fluxRecord.getValueByKey("_value").toString())); Object value = fluxRecord.getValueByKey("_value");
if(value!=null){
originData.add(Double.parseDouble(value.toString()));
}
} }
} }