Merge pull request 'yanyang' (#13) from yanyang into master

Reviewed-on: #13

ym-admin/src/main/java/com/cnbm/admin/controller/SysUserController.java

@@ -160,4 +160,10 @@ public class SysUserController {
 
         ExcelUtils.exportExcelToTarget(response, null, list, SysUserExcel.class);
     }
+
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取用户列表")
+    @LogOperation("获取用户列表")
+    public List<SysUserDTO> list(@ApiIgnore @RequestParam Map<String, Object> params) {
+        return sysUserService.list(params); }
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java

@@ -144,4 +144,12 @@ public class MachineController {
         return new Result().ok(true);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取机台列表")
+    @LogOperation("获取机台列表")
+    @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
+    public List<MachineDTO> list(@ApiIgnore @RequestParam Map<String, Object> params) {
+        return machineService.list(params);
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java

@@ -129,4 +129,11 @@ public class ProductController {
         return new Result();
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取产品列表")
+    @LogOperation("获取产品列表")
+    public List<ProductDTO> list() {
+        return productService.list();
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java

@@ -114,4 +114,11 @@ public class ShiftController {
         ExcelUtils.exportExcelToTarget(response, null, list, ShiftExcel.class);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取班次列表")
+    @LogOperation("获取班次列表")
+    public List<ShiftDTO> list() {
+        return shiftService.list();
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java

@@ -1,6 +1,7 @@
 package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.basic.dto.ShiftDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -114,4 +115,9 @@ public class TeamController {
         ExcelUtils.exportExcelToTarget(response, null, list, TeamExcel.class);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取班组列表")
+    @LogOperation("获取班组列表")
+    public List<TeamDTO> list() { return teamService.list(); }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/dto/ProductFeaturesDTO.java

@@ -19,7 +19,6 @@ public class ProductFeaturesDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-
 	@ApiModelProperty(value = "ID")
 	private Long id;
 

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductMapper.java

@@ -7,6 +7,7 @@ import com.cnbm.basic.entity.Product;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,4 +19,5 @@ import java.util.Map;
 @Mapper
 public interface ProductMapper extends BaseDao<Product> {
 //    IPage<ProductDTO> page(Map<String, Object> params);
+    List<ProductDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/ShiftMapper.java

@@ -1,9 +1,12 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.ShiftDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Shift;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 班次 表
  *
@@ -13,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ShiftMapper extends BaseDao<Shift> {
 
+    List<ShiftDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/TeamMapper.java

@@ -1,9 +1,12 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.TeamDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Team;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 班组 表
  *
@@ -13,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TeamMapper extends BaseDao<Team> {
 
+    List<TeamDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IProductService.java

@@ -6,6 +6,7 @@ import com.cnbm.basic.dto.ProductDTO;
 import com.cnbm.basic.entity.Product;
 import com.cnbm.common.vo.IdVo;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,4 +28,6 @@ public interface IProductService extends CrudService<Product, ProductDTO> {
 
     boolean changeStatus(Long id);
 
+    List<ProductDTO> list();
+
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IShiftService.java

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.ShiftDTO;
 import com.cnbm.basic.entity.Shift;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,4 +24,6 @@ public interface IShiftService extends CrudService<Shift, ShiftDTO> {
     void update(ShiftDTO dto);
 
     void delete(Long[] ids);
+
+    List<ShiftDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/service/ITeamService.java

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.TeamDTO;
 import com.cnbm.basic.entity.Team;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,4 +24,6 @@ public interface ITeamService extends CrudService<Team, TeamDTO> {
     void update(TeamDTO dto);
 
     void delete(Long[] ids);
+
+    List<TeamDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java

@@ -125,4 +125,11 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
         deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ProductDTO> list() {
+        List<ProductDTO> list = mapper.list();
+        return list;
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java

@@ -10,10 +10,12 @@ import com.cnbm.basic.entity.Shift;
 import com.cnbm.basic.service.IShiftService;
 import com.cnbm.common.utils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,6 +27,9 @@ import java.util.Map;
 @Service
 public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftDTO> implements IShiftService {
 
+    @Autowired
+    private ShiftMapper mapper;
+
     @Override
     public QueryWrapper<Shift> getWrapper(Map<String, Object> params){
         String id = (String)params.get("id");
@@ -72,4 +77,11 @@ public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftD
         deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ShiftDTO> list() {
+        List<ShiftDTO> list = mapper.list();
+        return list;
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java

@@ -2,8 +2,6 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cnbm.basic.dto.ProductTypeDTO;
-import com.cnbm.basic.entity.ProductType;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.TeamDTO;
@@ -12,11 +10,13 @@ import com.cnbm.basic.entity.Team;
 import com.cnbm.basic.service.ITeamService;
 import com.cnbm.common.utils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,6 +28,9 @@ import java.util.Map;
 @Service
 public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO> implements ITeamService {
 
+    @Autowired
+    private TeamMapper mapper;
+
     @Override
     public QueryWrapper<Team> getWrapper(Map<String, Object> params){
         String id = (String)params.get("id");
@@ -74,4 +77,11 @@ public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO>
         deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<TeamDTO> list() {
+        List<TeamDTO> list = mapper.list();
+        return list;
+    }
+
 }

ym-baisc/src/main/resources/mapper/ProductMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.ProductMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.ProductDTO">
+        select * from product
+        order by id asc
+    </select>
+
 </mapper>

ym-baisc/src/main/resources/mapper/ShiftMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.ShiftMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.ShiftDTO">
+        select * from shift
+        order by id asc
+    </select>
+
 </mapper>

ym-baisc/src/main/resources/mapper/TeamMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.TeamMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.TeamDTO">
+        select * from team
+        order by id asc
+    </select>
+
 </mapper>

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

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

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

@@ -0,0 +1,118 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.InspectionSheetDTO;
+import com.cnbm.generator.code.excel.InspectionSheetExcel;
+import com.cnbm.generator.code.service.IInspectionSheetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 检验单 表  前端控制器
+ *
+ * @author why
+ * @since  2022-12-07
+ */
+@RestController
+@RequestMapping("/code/inspectionSheet")
+@Api(tags="检验单 表")
+public class InspectionSheetController {
+    @Autowired
+    private IInspectionSheetService inspectionSheetService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:page')")
+    public Result<PageData<InspectionSheetDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<InspectionSheetDTO> page = inspectionSheetService.page(params);
+
+        return new Result<PageData<InspectionSheetDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:info')")
+    public Result<InspectionSheetDTO> get(@PathVariable("id") Long id){
+        InspectionSheetDTO data = inspectionSheetService.get(id);
+
+        return new Result<InspectionSheetDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:save')")
+    public Result<Long> save(@RequestBody InspectionSheetDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        try {
+            inspectionSheetService.save(dto);
+        }catch (Exception e){
+            return new Result<Long>().error(1,"没有发现检验参数");
+        }
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:update')")
+    public Result<Long> update(@RequestBody InspectionSheetDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        inspectionSheetService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        inspectionSheetService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<InspectionSheetDTO> list = inspectionSheetService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, InspectionSheetExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/InspectionSheetDTO.java

@@ -0,0 +1,104 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since  2022-12-07
+ */
+@Data
+@ApiModel(value = "检验单 表DTO对象")
+public class InspectionSheetDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "订单号，手动输入")
+	private String orderNumber;
+
+	@ApiModelProperty(value = "批次号，手填")
+	private String batchNumber;
+
+	@ApiModelProperty(value = "检验站点，手填")
+	private String inspectionSite;
+
+	@ApiModelProperty(value = "产品id，关联product表")
+	private Long productId;
+
+	@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+	private Integer inspectionStage;
+
+	@ApiModelProperty(value = "工序id，关联working_procedure表")
+	private Long workingProcedureId;
+
+	@ApiModelProperty(value = "机台id，关联machine表")
+	private Long machineId;
+
+	@ApiModelProperty(value = "班次id，关联shift表")
+	private Long shiftId;
+
+	@ApiModelProperty(value = "分组样本数（就是这个产品下所有检测参数 的 最大样本数），只给用户查看，值是后台自动计算的")
+	private Integer numberOfGroupedSamples;
+
+	@ApiModelProperty(value = "样本大小（就是检验单（母体）下的子样个数）,只给用户查看，值是后台自动计算的")
+	private Integer numberOfSamples;
+
+	@ApiModelProperty(value = "缺陷数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+	private Integer numberOfDefects;
+
+	@ApiModelProperty(value = "不良数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+	private Integer defectiveQuantity;
+
+	@ApiModelProperty(value = "生产人")
+	private String producer;
+
+	@ApiModelProperty(value = "检验人")
+	private String inspector;
+
+	@ApiModelProperty(value = "产品特性类型：1 计量型；2 计数型")
+	private Integer type;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private Integer status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/InspectionSheet.java

@@ -0,0 +1,106 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 检验单 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-12-07
+ */
+@Data
+@TableName("inspection_sheet")
+@ApiModel(value = "InspectionSheet对象", description = "检验单 表")
+public class InspectionSheet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("订单号，手动输入")
+    private String orderNumber;
+
+    @ApiModelProperty("批次号，手填")
+    private String batchNumber;
+
+    @ApiModelProperty("检验站点，手填")
+    private String inspectionSite;
+
+    @ApiModelProperty("产品id，关联product表")
+    private Long productId;
+
+    @ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+
+    @ApiModelProperty("工序id，关联working_procedure表")
+    private Long workingProcedureId;
+
+    @ApiModelProperty("机台id，关联machine表")
+    private Long machineId;
+
+    @ApiModelProperty("班次id，关联shift表")
+    private Long shiftId;
+
+    @ApiModelProperty("分组样本数（就是这个产品下所有检测参数 的 最大样本数），只给用户查看，值是后台自动计算的")
+    private Integer numberOfGroupedSamples;
+
+    @ApiModelProperty("样本大小（就是检验单（母体）下的子样个数）,只给用户查看，值是后台自动计算的")
+    private Integer numberOfSamples;
+
+    @ApiModelProperty("缺陷数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer numberOfDefects;
+
+    @ApiModelProperty("不良数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer defectiveQuantity;
+
+    @ApiModelProperty("生产人")
+    private String producer;
+
+    @ApiModelProperty("检验人")
+    private String inspector;
+
+    @ApiModelProperty("产品特性类型：1 计量型；2 计数型")
+    private Integer type;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private Integer status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/InspectionSheetExcel.java

@@ -0,0 +1,72 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since  2022-12-07
+ */
+@Data
+public class InspectionSheetExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "订单号，手动输入")
+    private String orderNumber;
+    @Excel(name = "批次号，手填")
+    private String batchNumber;
+    @Excel(name = "检验站点，手填")
+    private String inspectionSite;
+    @Excel(name = "产品id，关联product表")
+    private Long productId;
+    @Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+    @Excel(name = "工序id，关联working_procedure表")
+    private Long workingProcedureId;
+    @Excel(name = "机台id，关联machine表")
+    private Long machineId;
+    @Excel(name = "班次id，关联shift表")
+    private Long shiftId;
+    @Excel(name = "分组样本数（就是这个产品下所有检测参数 的 最大样本数），只给用户查看，值是后台自动计算的")
+    private Integer numberOfGroupedSamples;
+    @Excel(name = "样本大小（就是检验单（母体）下的子样个数）,只给用户查看，值是后台自动计算的")
+    private Integer numberOfSamples;
+    @Excel(name = "缺陷数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer numberOfDefects;
+    @Excel(name = "不良数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer defectiveQuantity;
+    @Excel(name = "生产人")
+    private String producer;
+    @Excel(name = "检验人")
+    private String inspector;
+    @Excel(name = "产品特性类型：1 计量型；2 计数型")
+    private Integer type;
+    @Excel(name = "1 可用，0 不可用")
+    private Integer status;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/InspectionSheetMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.InspectionSheet;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since 2022-12-07
+ */
+@Mapper
+public interface InspectionSheetMapper extends BaseDao<InspectionSheet> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/InspectionSheetMapper.xml

@@ -0,0 +1,33 @@
+<?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.cnbm.generator.code.mapper.InspectionSheetMapper">
+    <resultMap type="com.cnbm.generator.code.entity.InspectionSheet" id="InspectionSheetMap">
+            <id column="id" property="id" />
+            <id column="order_number" property="orderNumber" />
+            <id column="batch_number" property="batchNumber" />
+            <id column="inspection_site" property="inspectionSite" />
+            <id column="product_id" property="productId" />
+            <id column="inspection_stage" property="inspectionStage" />
+            <id column="working_procedure_id" property="workingProcedureId" />
+            <id column="machine_id" property="machineId" />
+            <id column="shift_id" property="shiftId" />
+            <id column="number_of_grouped_samples" property="numberOfGroupedSamples" />
+            <id column="number_of_samples" property="numberOfSamples" />
+            <id column="number_of_defects" property="numberOfDefects" />
+            <id column="defective_quantity" property="defectiveQuantity" />
+            <id column="producer" property="producer" />
+            <id column="inspector" property="inspector" />
+            <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>

ym-generator/src/main/java/com/cnbm/generator/code/mysql/InspectionSheetmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1600308190230409218, 1067246875800000035, '检验单 表', 'code/inspectionSheet', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1600308190230409219, 1600308190230409218, '查看', NULL, 'code:inspectionSheet:page,code:inspectionSheet:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1600308190230409220, 1600308190230409218, '新增', NULL, 'code:inspectionSheet:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1600308190230409221, 1600308190230409218, '修改', NULL, 'code:inspectionSheet:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1600308190230409222, 1600308190230409218, '删除', NULL, 'code:inspectionSheet:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1600308190230409223, 1600308190230409218, '导出', NULL, 'code:inspectionSheet:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/service/IInspectionSheetService.java

@@ -0,0 +1,15 @@
+package com.cnbm.generator.code.service;
+
+import com.cnbm.common.service.CrudService;
+import com.cnbm.generator.code.dto.InspectionSheetDTO;
+import com.cnbm.generator.code.entity.InspectionSheet;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since  2022-12-07
+ */
+public interface IInspectionSheetService extends CrudService<InspectionSheet, InspectionSheetDTO> {
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/service/impl/InspectionSheetServiceImpl.java

@@ -0,0 +1,34 @@
+package com.cnbm.generator.code.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.generator.code.dto.InspectionSheetDTO;
+import com.cnbm.generator.code.mapper.InspectionSheetMapper;
+import com.cnbm.generator.code.entity.InspectionSheet;
+import com.cnbm.generator.code.service.IInspectionSheetService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since 2022-12-07
+ */
+@Service
+public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetMapper, InspectionSheet, InspectionSheetDTO> implements IInspectionSheetService {
+
+    @Override
+    public QueryWrapper<InspectionSheet> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<InspectionSheet> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}

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

@@ -31,5 +31,6 @@ public class QueryDataParam extends BaseParam{
     private List<String> dropedTagNames;
     private String bucket;
     private String groupName;
+    //private String inspectionSheetId;
 
 }

ym-process-inspection/pom.xml

@@ -14,6 +14,8 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+        <!-- fastjson -->
+        <fastjson.version>1.2.75</fastjson.version>
     </properties>
 
     <dependencies>
@@ -38,5 +40,10 @@
             <artifactId>ym-quality-planning</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -1,6 +1,8 @@
 package com.cnbm.processInspection.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.basic.dto.FeaturesProcedureDTO;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -12,8 +14,10 @@ import com.cnbm.common.validator.group.AddGroup;
 import com.cnbm.common.validator.group.DefaultGroup;
 import com.cnbm.common.validator.group.UpdateGroup;
 import com.cnbm.influx.param.QueryDataParam;
+import com.cnbm.influx.template.Event;
 import com.cnbm.processInspection.dto.InspectionSampleDTO;
 import com.cnbm.processInspection.dto.InspectionSheetDTO;
+import com.cnbm.processInspection.entity.InspectionSheet;
 import com.cnbm.processInspection.excel.InspectionSheetExcel;
 import com.cnbm.processInspection.service.IInspectionSheetService;
 import com.influxdb.query.FluxTable;
@@ -86,9 +90,19 @@ public class InspectionSheetController {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        inspectionSheetService.save(dto);
+//        try {
-
+//            inspectionSheetService.saveSheet(dto);
-        return new Result<Long>().ok(dto.getId());
+//        }catch (Exception e){
+//            return new Result<Long>().error(1,"没有发现检验参数");
+//        }
+        InspectionSheet entity = inspectionSheetService.saveSheet(dto);
+        if(entity.getNumberOfSamples()!=null){
+            inspectionSheetService.insert(entity);
+            return new Result<Long>().ok(entity.getId());
+        }
+        else{
+            return new Result<Long>().error(1,"没有发现检验参数");
+        }
     }
 
     @PutMapping
@@ -146,23 +160,46 @@ public class InspectionSheetController {
 
     @PostMapping(value = "getFluxParamList")
     @ApiOperation(value = "从influxdb中获取检测参数")
-    @ApiImplicitParams({
+//    @ApiImplicitParams({
-        @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+//        @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class),
-        @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+//        @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class),
-        @ApiImplicitParam(name = "id", value = "检验单号", paramType = "query", dataTypeClass = Integer.class),
+//        @ApiImplicitParam(name = "inspectionSheetId", value = "检验单号", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "workingProcedureName", value = "工序名称", paramType = "query", dataTypeClass = String.class)
+//        @ApiImplicitParam(name = "workingProcedureName", value = "工序名称", paramType = "query", dataTypeClass = String.class)
-    })
+//    })
-    List<FluxTable> getFluxParamList(@ApiIgnore @RequestParam Map<String, Object> params){
+//    List<Event> getFluxParamList(@ApiIgnore @RequestParam Map<String, Object> params){
-        return inspectionSheetService.getFluxParamList(params);
+//        return inspectionSheetService.getFluxParamList(params);
+//    }
+    List<InspectionSampleDTO> getFluxParamList(@RequestParam("inspectionSheetId") Long inspectionSheetId){
+        return inspectionSheetService.getFluxParamList(inspectionSheetId);
     }
 
-    @PutMapping("saveFluxParamList")
+    @PostMapping("saveFluxParamList")
     @ApiOperation("将样本检测参数写入influxdb")
     public Result saveFluxParamList(@RequestBody InspectionSampleDTO[] lists){
 
         inspectionSheetService.saveFluxParamList(lists);
-
+        //样本数据更新后 计算检验单缺陷数不良数
+        inspectionSheetService.calculate(Long.valueOf(lists[0].getInspectionSheetId()));
         return new Result();
     }
 
+    @PostMapping("getInspectionSheetFeaturesList")
+    @ApiOperation("获取检验单对应检验属性")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "productId", value = "产品", paramType = "query", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "workingProcedureId", value = "工序", paramType = "query", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "inspectionStage", value = "检测阶段", paramType = "query", dataTypeClass = Integer.class)
+    })
+    public Result getInspectionSheetFeaturesList(@ApiIgnore @RequestParam Map<String, Object> params){
+        List<ProductFeaturesDTO> list = inspectionSheetService.getInspectionSheetFeaturesList(params);
+        return new Result<List<ProductFeaturesDTO>>().ok(list);
+    }
+
+    @PostMapping(value = "calculate")
+    @ApiOperation(value = "检验单统计计算")
+    public Result<Long> calculate(@RequestParam("inspectionSheetId") Long inspectionSheetId){
+        inspectionSheetService.calculate(inspectionSheetId);
+        return new Result<Long>().ok(inspectionSheetId);
+    }
+
 }

ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 检验样本 表
@@ -22,4 +23,16 @@ public class InspectionSampleDTO implements Serializable {
     @ApiModelProperty(value = "检验单id")
     private String inspectionSheetId;
 
+    @ApiModelProperty(value = "检验参数，json格式")
+    private String jsonData;
+
+    @ApiModelProperty(value = "批次号")
+    private String batchNum;
+
+    @ApiModelProperty(value = "取样时间")
+    private LocalDateTime sampleTime;
+
+    @ApiModelProperty(value = "样本号")
+    private String sampleNumber;
+
 }

ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSheetDTO.java

@@ -39,8 +39,8 @@ public class InspectionSheetDTO implements Serializable {
 	@ApiModelProperty(value = "产品名称，关联product表")
 	private String productName;
 
-	@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
+	@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
-	private String inspectionStage;
+	private Integer inspectionStage;
 
 	@ApiModelProperty(value = "工序id，关联working_procedure表")
 	private Long workingProcedureId;

ym-process-inspection/src/main/java/com/cnbm/processInspection/entity/InspectionSheet.java

@@ -38,8 +38,8 @@ public class InspectionSheet implements Serializable {
     @ApiModelProperty("产品id，关联product表")
     private Long productId;
 
-    @ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
+    @ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
-    private String inspectionStage;
+    private Integer inspectionStage;
 
     @ApiModelProperty("工序id，关联working_procedure表")
     private Long workingProcedureId;

ym-process-inspection/src/main/java/com/cnbm/processInspection/excel/InspectionSheetExcel.java

@@ -23,8 +23,8 @@ public class InspectionSheetExcel {
     private String inspectionSite;
     @Excel(name = "产品id，关联product表")
     private Long productId;
-    @Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
+    @Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
-    private String inspectionStage;
+    private Integer inspectionStage;
     @Excel(name = "工序id，关联working_procedure表")
     private Long workingProcedureId;
     @Excel(name = "机台id，关联machine表")

ym-process-inspection/src/main/java/com/cnbm/processInspection/mapper/InspectionSheetMapper.java

@@ -1,5 +1,6 @@
 package com.cnbm.processInspection.mapper;
 
+import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.processInspection.dto.InspectionSheetDTO;
 import com.cnbm.processInspection.entity.InspectionSheet;
@@ -17,4 +18,6 @@ import java.util.Map;
 @Mapper
 public interface InspectionSheetMapper extends BaseDao<InspectionSheet> {
 	List<InspectionSheetDTO> list(Map<String, Object> params);
+//	Integer getNumberOfSamples(Map<String, Object> params);
+	List<ProductFeaturesDTO> getInspectionSheetFeaturesList(Map<String, Object> params);
 }

ym-process-inspection/src/main/java/com/cnbm/processInspection/service/IInspectionSheetService.java

@@ -1,8 +1,11 @@
 package com.cnbm.processInspection.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.influx.param.QueryDataParam;
+import com.cnbm.influx.template.Event;
 import com.cnbm.processInspection.dto.InspectionSampleDTO;
 import com.cnbm.processInspection.dto.InspectionSheetDTO;
 import com.cnbm.processInspection.entity.InspectionSheet;
@@ -23,7 +26,7 @@ public interface IInspectionSheetService extends CrudService<InspectionSheet, In
 
     InspectionSheetDTO get(Long id);
 
-    void save(InspectionSheetDTO dto);
+    InspectionSheet saveSheet(InspectionSheetDTO dto);
 
     void update(InspectionSheetDTO dto);
 
@@ -31,8 +34,13 @@ public interface IInspectionSheetService extends CrudService<InspectionSheet, In
 
     List<InspectionSheetDTO> list(Map<String, Object> params);
 
-    List<FluxTable> getFluxParamList(Map<String, Object> params);
+//    List<Event> getFluxParamList(Map<String, Object> params);
+    List<InspectionSampleDTO> getFluxParamList(Long inspectionSheetId);
 
     void saveFluxParamList(InspectionSampleDTO[] lists);
 
+    List<ProductFeaturesDTO> getInspectionSheetFeaturesList(Map<String, Object> params);
+
+    void calculate(Long inspectionSheetId);
+
 }

ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java

@@ -1,8 +1,11 @@
 package com.cnbm.processInspection.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.basic.entity.Machine;
 import com.cnbm.basic.entity.Product;
 import com.cnbm.basic.entity.Shift;
@@ -13,27 +16,36 @@ import com.cnbm.basic.service.impl.ShiftServiceImpl;
 import com.cnbm.basic.service.impl.WorkingProcedureServiceImpl;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.common.spc.util.DataUtils;
 import com.cnbm.common.utils.ConvertUtils;
 import com.cnbm.influx.config.InfluxClient;
+import com.cnbm.influx.param.PageInfo;
 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.cnbm.processInspection.dto.InspectionSampleDTO;
 import com.cnbm.processInspection.dto.InspectionSheetDTO;
 import com.cnbm.processInspection.entity.InspectionSheet;
 import com.cnbm.processInspection.mapper.InspectionSheetMapper;
 import com.cnbm.processInspection.service.IInspectionSheetService;
+import com.google.gson.JsonObject;
+import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.annotation.Resource;
 import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 检验单 表
@@ -57,11 +69,11 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
     private ShiftServiceImpl shiftService;
 
     @Override
-    public QueryWrapper<InspectionSheet> getWrapper(Map<String, Object> params){
+    public QueryWrapper<InspectionSheet> getWrapper(Map<String, Object> params) {
-        Long id = (Long)params.get("id");
+        Long id = (Long) params.get("id");
-        String inspectionSite = (String)params.get("inspectionSite");
+        String inspectionSite = (String) params.get("inspectionSite");
-        String orderNumber = (String)params.get("orderNumber");
+        String orderNumber = (String) params.get("orderNumber");
-        String batchNumber = (String)params.get("batchNumber");
+        String batchNumber = (String) params.get("batchNumber");
 
         QueryWrapper<InspectionSheet> wrapper = new QueryWrapper<>();
         wrapper.like(ObjectUtils.isNotNull(id), "id", id);
@@ -75,15 +87,15 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
     }
 
     @Override
-    public PageData<InspectionSheetDTO> page (Map<String, Object> params){
+    public PageData<InspectionSheetDTO> page(Map<String, Object> params) {
         IPage<InspectionSheet> page = baseDao.selectPage(
                 getPage(params, "id", true),
                 getWrapper(params)
         );
         PageData<InspectionSheetDTO> inspectionSheetDTOPageData = getPageData(page, InspectionSheetDTO.class);
 
-        if(!inspectionSheetDTOPageData.getList().isEmpty()){
+        if (!inspectionSheetDTOPageData.getList().isEmpty()) {
-            for(InspectionSheetDTO dto:inspectionSheetDTOPageData.getList()){
+            for (InspectionSheetDTO dto : inspectionSheetDTOPageData.getList()) {
                 Product product = productService.selectById(dto.getProductId());
                 WorkingProcedure workingProcedure = workingProcedureService.selectById(dto.getWorkingProcedureId());
                 Machine machine = machineService.selectById(dto.getMachineId());
@@ -94,16 +106,16 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
                 String machineName = null;
                 String shiftName = null;
 
-                if (product!=null){
+                if (product != null) {
                     productName = product.getName();
                 }
-                if (workingProcedure!=null){
+                if (workingProcedure != null) {
                     workingProcedureName = workingProcedure.getName();
                 }
-                if (machine!=null){
+                if (machine != null) {
                     machineName = machine.getName();
                 }
-                if (shift!=null){
+                if (shift != null) {
                     shiftName = shift.getName();
                 }
 
@@ -119,14 +131,47 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
     @Override
     public InspectionSheetDTO get(Long id) {
         InspectionSheet entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, InspectionSheetDTO.class);
+        InspectionSheetDTO dto = ConvertUtils.sourceToTarget(entity, InspectionSheetDTO.class);
+        WorkingProcedure workingProcedure = workingProcedureService.selectById(dto.getWorkingProcedureId());
+        if(workingProcedure!=null){
+            dto.setWorkingProcedureName(workingProcedure.getName());
+        }
+        return dto;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(InspectionSheetDTO dto) {
+    public InspectionSheet saveSheet(InspectionSheetDTO dto) {
-        InspectionSheet entity = ConvertUtils.sourceToTarget(dto, InspectionSheet.class);
+        // 验证是否有检验参数
-        insert(entity);
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("productId", dto.getProductId());
+        params.put("workingProcedureId", dto.getWorkingProcedureId());
+        params.put("inspectionStage", dto.getInspectionStage());
+        List<ProductFeaturesDTO> inspectionSheetFeaturesList = getInspectionSheetFeaturesList(params);
+        if (inspectionSheetFeaturesList != null && inspectionSheetFeaturesList.size() != 0) {
+            //分组样本数=样本大小=检验特性分组数的最大值
+            Integer numbersOfSamples = inspectionSheetFeaturesList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
+            if (numbersOfSamples != null) {
+                dto.setNumberOfGroupedSamples(numbersOfSamples);
+                dto.setNumberOfSamples(numbersOfSamples);
+            }
+        }
+        /*
+        if (inspectionSheetFeaturesList == null || inspectionSheetFeaturesList.size() == 0) {
+            throw new RuntimeException("没有发现检验参数");
+        } else {
+            //分组样本数=样本大小=检验特性分组数的最大值
+            Integer numbersOfSamples = inspectionSheetFeaturesList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
+            if (numbersOfSamples != null) {
+                dto.setNumberOfGroupedSamples(numbersOfSamples);
+                dto.setNumberOfSamples(numbersOfSamples);
+            }
+        }
+        */
+        //InspectionSheet entity = ConvertUtils.sourceToTarget(dto, InspectionSheet.class);
+        InspectionSheet entity =  new InspectionSheet();
+        BeanUtils.copyProperties(dto, entity);
+        return entity;
     }
 
     @Override
@@ -143,7 +188,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         deleteBatchIds(Arrays.asList(ids));
     }
 
-    @Autowired
+    @Resource
     private InspectionSheetMapper mapper;
 
     @Override
@@ -154,41 +199,225 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
     }
 
     @Override
-    public List<FluxTable> getFluxParamList(Map<String, Object> params){
+    public List<InspectionSampleDTO> getFluxParamList(Long id) {
+        List<Event> eventList = new ArrayList<>();
+        InspectionSheetDTO dto = get(id);
+        if (dto != null && dto.getWorkingProcedureName()!=null) {
             QueryDataParam queryDataParam = new QueryDataParam();
-        String workingProcedureName = (String)params.get("workingProcedureName");
+            String inspectionSheetId = id.toString();
+            String workingProcedureName = dto.getWorkingProcedureName();
             queryDataParam.setMeasurement(workingProcedureName);
+            //queryDataParam.setInspectionSheetId(inspectionSheetId);
             queryDataParam.setBucket("qgs-bucket");
+            queryDataParam.setTag(new Tag("inspectionSheetId", inspectionSheetId));
+            List<String> dropNames = new ArrayList<>();
+            dropNames.add("transationId");
+            queryDataParam.setDropedTagNames(dropNames);
+            queryDataParam.setRange(new Range(DataUtils.getBeforeDate(999).toInstant(), DataUtils.getAfterDate(999).toInstant()));
+            queryDataParam.setPageInfo(new PageInfo(1, 10));
 
-        Instant startTime = (Instant) params.get("startTime");
+            List<FluxTable> fluxTableList = InfluxClient.Client.query(queryDataParam);
-        Instant endTime = (Instant) params.get("endTime");
+            for (FluxTable fluxTable : fluxTableList) {
-        Range range = new Range(startTime,endTime);
+                List<FluxRecord> records = fluxTable.getRecords(); // 获取实际的记录操作
-        queryDataParam.setRange(range);
+                for (FluxRecord fluxRecord : records) {
+                    Instant time = fluxRecord.getTime();
+                    String argName = (String) fluxRecord.getValueByKey("argName");
+                    String argValue = (String)fluxRecord.getValueByKey("_value");
+                    String sampleNo = (String) fluxRecord.getValueByKey("sampleNumber");
+                    eventList.add(newEvent(time, inspectionSheetId, argName, argValue, sampleNo));
+                }
+            }
+        }
+        List<InspectionSampleDTO> list = new ArrayList<>();
+        if (eventList != null || eventList.size() > 0) {
+            //根据样本号分组
+            Map<String, List<Event>> map = eventList.stream().collect(Collectors.groupingBy(Event::getSampleNumber));
+            for (Map.Entry<String, List<Event>> entry : map.entrySet()) {
+                String sampleNumber = entry.getKey();
+                List<Event> events = entry.getValue();
 
-        List<FluxTable> list = InfluxClient.Client.query(queryDataParam);
+                InspectionSampleDTO sampleDTO = new InspectionSampleDTO();
+                sampleDTO.setSampleNumber(sampleNumber);
+                sampleDTO.setSampleTime(LocalDateTime.ofInstant(events.get(0).getTime(), ZoneId.systemDefault()));
+                sampleDTO.setBatchNum(dto.getBatchNumber());
+                sampleDTO.setInspectionSheetId(events.get(0).getInspectionSheetId());
+
+                JSONObject jsonObject = new JSONObject();
+                for(Event event:events){
+                    jsonObject.put(event.getArgName(),event.getArgValue());
+                }
+                sampleDTO.setJsonData(jsonObject.toString());
+                //System.out.println(entry);
+                list.add(sampleDTO);
+            }
+        }
         return list;
     }
 
     @Override
-    public void saveFluxParamList(@RequestBody InspectionSampleDTO[] lists){
+    public void saveFluxParamList(InspectionSampleDTO[] lists) {
-        for(InspectionSampleDTO dto:lists){
+        for (InspectionSampleDTO dto : lists) {
-            String equipmentName = dto.getWorkingProcedureName();
+            //String jsonData = {"workingProcedureName":"test","inspectionSheetId":"116","param1":"0.47","param2":"0.687","param2":"0.53"};
-            LocalDateTime eventTimestamp = LocalDateTime.now();
+            String workingProcedureName = dto.getWorkingProcedureName();
-            Instant eventTime = eventTimestamp.toInstant(ZoneOffset.UTC);
+            String inspectionSheetId = dto.getInspectionSheetId();
-            String inspectionSheetId =dto.getInspectionSheetId();
+//            String batchNum = dto.getBatchNum();
-//            Event event = new Event(eventTime,inspectionSheetId,"ppExecName",ppExecName);
+            String sampleNumber = dto.getSampleNumber();
-//            InfluxClient.Client.insert(event,equipmentName);
+            String jsonData = dto.getJsonData();
+            JSONObject json = JSON.parseObject(jsonData);
+            LocalDateTime sampleTime = dto.getSampleTime();
+            Instant eventTime = sampleTime.toInstant(ZoneOffset.UTC);
+            List<Event> list = new ArrayList<>();
+            for (Map.Entry entry : json.entrySet()) {
+                String key = entry.getKey().toString();
+                String v = entry.getValue().toString();
+//                Double v = null;
+//                try {
+//                    v= Double.valueOf(entry.getValue().toString());
+//                }catch (Exception e){
+//                }
+                list.add(newEvent(eventTime, inspectionSheetId, key, v, sampleNumber));
             }
+            InfluxClient.Client.batchInsert(list, workingProcedureName);
+        }
+//        //样本数据更新后 计算检验单缺陷数不良数
+//        System.out.println("--------------------------------------");
+//        calculate(Long.valueOf(lists[0].getInspectionSheetId()));
     }
 
-    private Event newEvent(Instant time,String inspectionSheetId,String argName,Double argValue){
+    private Event newEvent(Instant time, String inspectionSheetId, String argName, String argValue, String sampleNo) {
         Event event = new Event();
         event.setInspectionSheetId(inspectionSheetId);
         event.setTime(time);
+//        event.setBatchNum(batchNum);
+        event.setSampleNumber(sampleNo);
         event.setArgName(argName);
-        if(!Objects.equals(argValue, "") && argValue != null ){
+        event.setArgValue(argValue);
-            event.setArgValue(argValue.toString());
+//        if (Objects.equals(argValue, "")){
-        }
+//            event.setArgValue("");
+//        }else if (argValue != null) {
+//            event.setArgValue(argValue.toString());
+//        }
         return event;
     }
+
+//    @Override
+//    public Integer getNumberOfSamples(Map<String, Object> params) {
+//        return mapper.getNumberOfSamples(params);
+//    }
+
+    @Override
+    public List<ProductFeaturesDTO> getInspectionSheetFeaturesList(Map<String, Object> params) {
+        return mapper.getInspectionSheetFeaturesList(params);
+    }
+
+    //计算并更新检验单缺陷数不良数
+    @Override
+    public void calculate(Long inspectionSheetId) {
+        List<InspectionSampleDTO> sampleDTOList = getFluxParamList(inspectionSheetId);
+        if (sampleDTOList != null || sampleDTOList.size() > 0) {
+            //缺陷
+            Integer numberOfDefects = 0;
+            //不良
+            Integer defectiveQuantity = 0;
+
+            //获取的产品特性参照值
+            InspectionSheetDTO dto = get(inspectionSheetId);
+            Map<String, Object> params2 = new HashMap<>();
+            params2.put("productId", dto.getProductId());
+            params2.put("workingProcedureId", dto.getWorkingProcedureId());
+            params2.put("inspectionStage", dto.getInspectionStage());
+            List<ProductFeaturesDTO> featuresList = getInspectionSheetFeaturesList(params2);
+            //循环每个样本组
+            for (InspectionSampleDTO sampleDTO : sampleDTOList) {
+                //该样本的缺陷数
+                Integer eventDefects = 0;
+                //该样本的属性列表
+                String jsonData = sampleDTO.getJsonData();
+                JSONObject json = JSON.parseObject(jsonData);
+                for (ProductFeaturesDTO feature : featuresList) {
+                    String v = (String)json.get(feature.getName());
+                    if (!Objects.equals(v, "") && v != null) {
+                        //1 计量型；2 计数型
+                        if (feature.getType() == 1) {
+                            Double featureValue = Double.valueOf(v);
+                            if (featureValue > feature.getUsl() || featureValue < feature.getLsl()) {
+                                eventDefects = eventDefects + 1;
+                            }
+                        }
+                        if (feature.getType() == 2) {
+                            Integer featureValue = Integer.valueOf(v);
+                            if (featureValue == 1) {
+                                eventDefects = eventDefects + 1;
+                            }
+                        }
+                    }
+                    if (eventDefects != 0) {
+                        numberOfDefects = numberOfDefects + eventDefects;
+                        defectiveQuantity = defectiveQuantity + 1;
+                    }
+                }
+            }
+            InspectionSheetDTO updateDto = new InspectionSheetDTO();
+            updateDto.setId(inspectionSheetId);
+            updateDto.setNumberOfDefects(numberOfDefects);
+            updateDto.setDefectiveQuantity(defectiveQuantity);
+            update(updateDto);
+        }
+
+    }
+        /*
+        //获取该检验单的所有样本数据
+        List<Event> eventList = getFluxParamList(inspectionSheetId);
+        if (eventList != null || eventList.size() > 0) {
+            //根据样本号分组
+            Map<String, List<Event>> map = eventList.stream().collect(Collectors.groupingBy(Event::getSampleNumber));
+            //获取的产品特性参照值
+            InspectionSheetDTO dto = get(inspectionSheetId);
+            Map<String, Object> params2 = new HashMap<>();
+            params2.put("productId", dto.getProductId());
+            params2.put("workingProcedureId", dto.getWorkingProcedureId());
+            params2.put("inspectionStage", dto.getInspectionStage());
+            //缺陷
+            Integer numberOfDefects = 0;
+            //不良
+            Integer defectiveQuantity = 0;
+
+            List<ProductFeaturesDTO> featuresList = getInspectionSheetFeaturesList(params2);
+            //循环每个样本组
+            for (Map.Entry<String, List<Event>> entry : map.entrySet()) {
+                //该样本的缺陷数
+                Integer eventDefects = 0;
+                //该样本的属性列表
+                List<Event> eventList1 = entry.getValue();
+                for (Event event : eventList1) {
+                    String featureName = event.getArgName();
+                    ProductFeaturesDTO feature = featuresList.stream().filter(u -> u.getName().equals(featureName)).findAny().orElse(null);
+                    if (feature != null && !Objects.equals(event.getArgValue(), "") && event.getArgValue() != null) {
+                        //1 计量型；2 计数型
+                        if (feature.getType() == 1) {
+                            Double featureValue = Double.valueOf(event.getArgValue());
+                            if (featureValue > feature.getUsl() || featureValue < feature.getLsl()) {
+                                eventDefects = eventDefects + 1;
+                            }
+                        }
+                        if (feature.getType() == 2) {
+                            Integer featureValue = Integer.valueOf(event.getArgValue());
+                            if (featureValue == 1) {
+                                eventDefects = eventDefects + 1;
+                            }
+                        }
+                    }
+                    if (eventDefects != 0) {
+                        numberOfDefects = numberOfDefects + eventDefects;
+                        defectiveQuantity = defectiveQuantity + 1;
+                    }
+                }
+            }
+            InspectionSheetDTO updateDto = new InspectionSheetDTO();
+            updateDto.setId(inspectionSheetId);
+            updateDto.setNumberOfDefects(numberOfDefects);
+            updateDto.setDefectiveQuantity(defectiveQuantity);
+            update(updateDto);
+        }
+    }*/
 }

ym-process-inspection/src/main/resources/mapper/InspectionSheetMapper.xml

@@ -64,4 +64,41 @@
         order by i.id asc
     </select>
 
+    <select id="getNumberOfSamples" resultType="Integer">
+        select max(sample_size)
+        from product_features pf
+        LEFT JOIN features_stage_procedure_relation fspr ON pf.id=fspr.product_features_id
+        <where>
+            pf.valid = 1 and fspr.valid = 1
+            <if test="productId != null">
+                and pf.product_id = #{productId}
+            </if>
+            <if test="inspectionStage != null">
+                and fspr.inspection_stage = #{inspectionStage}
+            </if>
+            <if test="workingProcedureId != null">
+                and fspr.working_procedure_id = #{workingProcedureId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getInspectionSheetFeaturesList" resultType="com.cnbm.basic.dto.ProductFeaturesDTO">
+        select pf.*
+        from features_stage_procedure_relation fspr
+        LEFT JOIN product_features pf ON pf.id=fspr.product_features_id
+        <where>
+            pf.valid = 1 and fspr.valid = 1
+            <if test="productId != null">
+                and pf.product_id = #{productId}
+            </if>
+            <if test="inspectionStage != null">
+                and fspr.inspection_stage = #{inspectionStage}
+            </if>
+            <if test="workingProcedureId != null">
+                and fspr.working_procedure_id = #{workingProcedureId}
+            </if>
+        </where>
+        order by pf.id asc
+    </select>
+
 </mapper>