更新 UTC 时间 转成 GMT+8 东八区时间

Reviewed-on: #20

README.md

@@ -0,0 +1,10 @@
+spc 主项目
+
+<br>
+
+**软件需求**
+- JDK1.8
+- Maven3.0+
+- MySQL8.0
+- redis6.0+
+<br>

pom.xml

@@ -35,7 +35,7 @@
         <java.version>1.8</java.version>
         <junit.version>4.13.2</junit.version>
         <jedis.version>4.2.2</jedis.version>
-<!--        <druid.version>1.2.9</druid.version>-->
+        <druid.version>1.2.9</druid.version>
         <mybatisplus.version>3.5.1</mybatisplus.version>
         <sqlserver.version>4.0</sqlserver.version>
         <oracle.version>11.2.0.3</oracle.version>
@@ -136,9 +136,14 @@
             <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jdbc</artifactId>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>${druid.version}</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-jdbc</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>cn.afterturn</groupId>

ym-admin/db/mysql.sql

@@ -15,6 +15,7 @@ CREATE TABLE sys_user (
   create_date datetime COMMENT '创建时间',
   updater bigint COMMENT '更新者',
   update_date datetime COMMENT '更新时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   unique key uk_username (username),
   key idx_create_date (create_date)
@@ -31,6 +32,7 @@ CREATE TABLE sys_dept (
   create_date datetime COMMENT '创建时间',
   updater bigint COMMENT '更新者',
   update_date datetime COMMENT '更新时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_pid (pid),
   key idx_sort (sort)
@@ -47,6 +49,7 @@ create table sys_role
   create_date          datetime COMMENT '创建时间',
   updater              bigint COMMENT '更新者',
   update_date          datetime COMMENT '更新时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_dept_id (dept_id)
 )ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色管理';
@@ -66,6 +69,7 @@ create table sys_menu
   create_date          datetime COMMENT '创建时间',
   updater              bigint COMMENT '更新者',
   update_date          datetime COMMENT '更新时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_pid (pid),
   key idx_sort (sort)
@@ -79,6 +83,7 @@ create table sys_role_user
   user_id              bigint COMMENT '用户ID',
   creator              bigint COMMENT '创建者',
   create_date          datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_role_id (role_id),
   key idx_user_id (user_id)
@@ -92,6 +97,7 @@ create table sys_role_menu
   menu_id              bigint COMMENT '菜单ID',
   creator              bigint COMMENT '创建者',
   create_date          datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_role_id (role_id),
   key idx_menu_id (menu_id)
@@ -105,6 +111,7 @@ create table sys_role_data_scope
   dept_id              bigint COMMENT '部门ID',
   creator              bigint COMMENT '创建者',
   create_date          datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_role_id (role_id)
 )ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色数据权限';
@@ -121,6 +128,7 @@ create table sys_params
   create_date          datetime COMMENT '创建时间',
   updater              bigint COMMENT '更新者',
   update_date          datetime COMMENT '更新时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   unique key uk_param_code (param_code),
   key idx_create_date (create_date)
@@ -138,6 +146,7 @@ create table sys_dict_type
     create_date          datetime COMMENT '创建时间',
     updater              bigint COMMENT '更新者',
     update_date          datetime COMMENT '更新时间',
+    valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
     primary key (id),
     UNIQUE KEY(dict_type)
 )ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='字典类型';
@@ -155,6 +164,7 @@ create table sys_dict_data
     create_date          datetime COMMENT '创建时间',
     updater              bigint COMMENT '更新者',
     update_date          datetime COMMENT '更新时间',
+    valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
     primary key (id),
     unique key uk_dict_type_value (dict_type_id, dict_value),
     key idx_sort (sort)
@@ -171,6 +181,7 @@ create table sys_log_login
   creator_name         varchar(50) COMMENT '用户名',
   creator              bigint COMMENT '创建者',
   create_date          datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_status (status),
   key idx_create_date (create_date)
@@ -191,6 +202,7 @@ create table sys_log_operation
   creator_name         varchar(50) COMMENT '用户名',
   creator              bigint COMMENT '创建者',
   create_date          datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_create_date (create_date)
 )ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='操作日志';
@@ -207,6 +219,7 @@ create table sys_log_error
   error_info           text COMMENT '异常信息',
   creator              bigint COMMENT '创建者',
   create_date          datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   primary key (id),
   key idx_create_date (create_date)
 )ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='异常日志';
@@ -218,6 +231,7 @@ CREATE TABLE sys_oss (
   url varchar(200) COMMENT 'URL地址',
   creator bigint COMMENT '创建者',
   create_date datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   PRIMARY KEY (id),
   key idx_create_date (create_date)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='文件上传';
@@ -234,6 +248,7 @@ CREATE TABLE schedule_job (
   create_date datetime COMMENT '创建时间',
   updater bigint COMMENT '更新者',
   update_date datetime COMMENT '更新时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   PRIMARY KEY (id),
   key idx_create_date (create_date)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='定时任务';
@@ -248,6 +263,7 @@ CREATE TABLE schedule_job_log (
   error varchar(2000) DEFAULT NULL COMMENT '失败信息',
   times int NOT NULL COMMENT '耗时(单位：毫秒)',
   create_date datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   PRIMARY KEY (id),
   key idx_job_id (job_id),
   key idx_create_date (create_date)
@@ -261,6 +277,7 @@ CREATE TABLE sys_user_token (
   expire_date datetime COMMENT '过期时间',
   update_date datetime COMMENT '更新时间',
   create_date datetime COMMENT '创建时间',
+  valid tinyint COMMENT '删除标识，是否有效：1可用  0不可用',
   PRIMARY KEY (id),
   UNIQUE KEY user_id (user_id),
   UNIQUE KEY token (token)

ym-admin/src/main/java/com/cnbm/admin/aspect/LogOperationAspect.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
+import java.util.Date;
 
 /**
  * @Author weihongyang
@@ -78,6 +79,7 @@ public class LogOperationAspect {
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         if(loginUser != null){
             log.setCreatorName(loginUser.getUsername());
+            log.setCreator(loginUser.getSysUserEntity().getCreator());
         }
 
         log.setStatus(status);
@@ -89,6 +91,7 @@ public class LogOperationAspect {
         log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
         log.setRequestUri(request.getRequestURI());
         log.setRequestMethod(request.getMethod());
+        log.setCreateDate(new Date());
 
         //请求参数
         Object[] args = joinPoint.getArgs();

ym-admin/src/main/java/com/cnbm/admin/config/MybatisPlusConfig.java

@@ -0,0 +1,29 @@
+package com.cnbm.admin.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.cnbm.common.interceptor.DataFilterInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+        // 数据权限
+        mybatisPlusInterceptor.addInnerInterceptor(new DataFilterInterceptor());
+        // 分页插件
+        mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+        // 乐观锁
+        mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+        // 防止全表更新与删除
+        mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
+
+        return mybatisPlusInterceptor;
+    }
+
+}

ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java

@@ -73,8 +73,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/webjars/**",
                         "/websocket/**",
                         "/influx/**",
-                        "/basic/**",
-                        "/processInspection/**",
+                        "/spcData/**",
+
+//                        "/basic/**",
+//                        "/qualityPlanning/**",
+//                        "/processInspection/**",
                         "/captcha").anonymous()
 //                .antMatchers("/testCors").hasAuthority("system:dept:list222")
                 // 除上面外的所有请求全部需要鉴权认证

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

@@ -6,6 +6,7 @@ import com.cnbm.admin.service.CaptchaService;
 import com.cnbm.admin.service.LoginService;
 import com.cnbm.admin.utils.ResponseResult;
 import com.cnbm.common.exception.ErrorCode;
+import com.cnbm.common.utils.Result;
 import com.cnbm.common.validator.AssertUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -52,13 +53,16 @@ public class LoginController {
 
     @PostMapping("/login")
     @ApiOperation(value = "登录")
-    public ResponseResult login(HttpServletRequest request, @RequestBody LoginParam loginParam) {
+    public Result login(HttpServletRequest request, @RequestBody LoginParam loginParam) {
         return loginService.login(request,loginParam);
     }
 
-    @PostMapping("/doLogout")
+    @PostMapping("logout")
     @ApiOperation(value = "退出")
-    public void logout(){
+    public Result logout(HttpServletRequest request){
+        loginService.logout(request);
+        return new Result();
     }
+    
 
 }

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

@@ -40,10 +40,11 @@ public class SysDictDataController {
             @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) ,
+            @ApiImplicitParam(name = "dictTypeId", value = "字典类型id", paramType = "query", dataTypeClass = String.class),
             @ApiImplicitParam(name = "dictLabel", value = "字典标签", paramType = "query", dataTypeClass=String.class),
             @ApiImplicitParam(name = "dictValue", value = "字典值", paramType = "query", dataTypeClass=String.class)
     })
-    @PreAuthorize("@ex.hasAuthority('sys:dept:page')")
+    @PreAuthorize("@ex.hasAuthority('sys:dict:page')")
     public Result<PageData<SysDictDataDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         //字典类型
         PageData<SysDictDataDTO> page = sysDictDataService.page(params);

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

@@ -0,0 +1,69 @@
+package com.cnbm.admin.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.admin.dto.SysLogLoginDTO;
+import com.cnbm.admin.execl.SysLogLoginExcel;
+import com.cnbm.admin.service.SysLogLoginService;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("sys/log/login")
+@Api(tags="登录日志")
+@Log4j2
+public class SysLogLoginController {
+    @Autowired
+    private SysLogLoginService sysLogLoginService;
+
+    @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) ,
+            @ApiImplicitParam(name = "status", value = "状态  0：失败    1：成功    2：账号已锁定", paramType = "query", dataTypeClass=Integer.class),
+            @ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('sys:log:login')")
+    public Result<PageData<SysLogLoginDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<SysLogLoginDTO> page = sysLogLoginService.page(params);
+
+        log.info("PageData<SysLogLoginDTO>====={}",page.toString());
+
+        return new Result<PageData<SysLogLoginDTO>>().ok(page);
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "status", value = "状态  0：失败    1：成功    2：账号已锁定", paramType = "query", dataTypeClass=Integer.class),
+            @ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('sys:log:login')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<SysLogLoginDTO> list = sysLogLoginService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);
+    }
+
+}

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

@@ -44,13 +44,13 @@ public class SysRoleController {
 
     @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) ,
-            @ApiImplicitParam(name = "name", value = "角色名", paramType = "query", dataTypeClass=String.class)
-    })
+//    @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) ,
+//            @ApiImplicitParam(name = "name", value = "角色名", paramType = "query", dataTypeClass=String.class)
+//    })
     @PreAuthorize("@ex.hasAuthority('sys:role:page')")
     public Result<PageData<SysRoleDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<SysRoleDTO> page = sysRoleService.page(params);

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-admin/src/main/java/com/cnbm/admin/dao/SysLogLoginDao.java

@@ -0,0 +1,10 @@
+package com.cnbm.admin.dao;
+
+import com.cnbm.admin.entity.SysLogLoginEntity;
+import com.cnbm.common.dao.BaseDao;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysLogLoginDao extends BaseDao<SysLogLoginEntity> {
+
+}

ym-admin/src/main/java/com/cnbm/admin/dto/SysLogLoginDTO.java

@@ -0,0 +1,36 @@
+package com.cnbm.admin.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "登录日志")
+public class SysLogLoginDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "用户操作  0：用户登录   1：用户退出")
+    private Integer operation;
+
+    @ApiModelProperty(value = "状态  0：失败    1：成功    2：账号已锁定")
+    private Integer status;
+
+    @ApiModelProperty(value = "用户代理")
+    private String userAgent;
+
+    @ApiModelProperty(value = "操作IP")
+    private String ip;
+
+    @ApiModelProperty(value = "用户名")
+    private String creatorName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+}

ym-admin/src/main/java/com/cnbm/admin/entity/LoginUser.java

@@ -1,16 +1,19 @@
 package com.cnbm.admin.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Author weihongyang
@@ -20,7 +23,9 @@ import java.util.stream.Collectors;
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class LoginUser implements UserDetails {
+public class LoginUser implements UserDetails,Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     private SysUserEntity sysUserEntity;
 

ym-admin/src/main/java/com/cnbm/admin/entity/SysLogLoginEntity.java

@@ -0,0 +1,35 @@
+package com.cnbm.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cnbm.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_log_login")
+public class SysLogLoginEntity extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户操作   0：用户登录   1：用户退出
+     */
+    private Integer operation;
+    /**
+     * 状态  0：失败    1：成功    2：账号已锁定
+     */
+    private Integer status;
+    /**
+     * 用户代理
+     */
+    private String userAgent;
+    /**
+     * 操作IP
+     */
+    private String ip;
+    /**
+     * 用户名
+     */
+    private String creatorName;
+
+}

ym-admin/src/main/java/com/cnbm/admin/enums/LoginOperationEnum.java

@@ -0,0 +1,22 @@
+package com.cnbm.admin.enums;
+
+public enum LoginOperationEnum {
+    /**
+     * 用户登录
+     */
+    LOGIN(0),
+    /**
+     * 用户退出
+     */
+    LOGOUT(1);
+
+    private int value;
+
+    LoginOperationEnum(int value) {
+        this.value = value;
+    }
+
+    public int value() {
+        return this.value;
+    }
+}

ym-admin/src/main/java/com/cnbm/admin/enums/LoginStatusEnum.java

@@ -0,0 +1,26 @@
+package com.cnbm.admin.enums;
+
+public enum LoginStatusEnum {
+    /**
+     * 失败
+     */
+    FAIL(0),
+    /**
+     * 成功
+     */
+    SUCCESS(1),
+    /**
+     * 账号已锁定
+     */
+    LOCK(2);
+
+    private int value;
+
+    LoginStatusEnum(int value) {
+        this.value = value;
+    }
+
+    public int value() {
+        return this.value;
+    }
+}

ym-admin/src/main/java/com/cnbm/admin/enums/WhetherEnum.java

@@ -0,0 +1,52 @@
+package com.cnbm.admin.enums;
+
+/**
+ * <p>
+ * 是、否有效枚举
+ * </P>
+ *
+ * @author xcc
+ * @date 2022年7月5日
+ * @since 1.0
+ */
+public enum WhetherEnum {
+
+    NO(0, "否"),
+
+    YES(1, "是");
+
+    private final Integer value;
+    private final String label;
+    private final String remark;
+
+    WhetherEnum(final int value, final String label) {
+        this(value, label, null);
+    }
+
+    WhetherEnum(final int value, final String label, final String remark) {
+        this.value = value;
+        this.label = label;
+        this.remark = remark;
+    }
+
+    /**
+     * @return 数据值
+     */
+    public Integer getValue() {
+        return value;
+    }
+
+    /**
+     * @return 标签名
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * @return 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+}

ym-admin/src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java

@@ -0,0 +1,24 @@
+package com.cnbm.admin.execl;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SysLogLoginExcel {
+    @Excel(name = "用户操作")
+    private String operation;
+    @Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"})
+    private Integer status;
+    @Excel(name = "User-Agent")
+    private String userAgent;
+    @Excel(name = "操作IP")
+    private String ip;
+    @Excel(name = "用户名")
+    private String creatorName;
+    @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
+
+}
+

ym-admin/src/main/java/com/cnbm/admin/service/LoginService.java

@@ -1,7 +1,7 @@
 package com.cnbm.admin.service;
 
 import com.cnbm.admin.params.LoginParam;
-import com.cnbm.admin.utils.ResponseResult;
+import com.cnbm.common.utils.Result;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface LoginService {
 
-    ResponseResult login(HttpServletRequest request, LoginParam loginParam);
+    Result login(HttpServletRequest request, LoginParam loginParam);
+
+    void logout(HttpServletRequest request);
 
 }

ym-admin/src/main/java/com/cnbm/admin/service/SysLogLoginService.java

@@ -0,0 +1,18 @@
+package com.cnbm.admin.service;
+
+import com.cnbm.admin.dto.SysLogLoginDTO;
+import com.cnbm.admin.entity.SysLogLoginEntity;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SysLogLoginService extends BaseService<SysLogLoginEntity> {
+
+    PageData<SysLogLoginDTO> page(Map<String, Object> params);
+
+    List<SysLogLoginDTO> list(Map<String, Object> params);
+
+    void save(SysLogLoginEntity entity);
+}

ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java

@@ -1,14 +1,22 @@
 package com.cnbm.admin.service.impl;
 
 import com.cnbm.admin.entity.LoginUser;
+import com.cnbm.admin.entity.SysLogLoginEntity;
+import com.cnbm.admin.enums.LoginOperationEnum;
+import com.cnbm.admin.enums.LoginStatusEnum;
 import com.cnbm.admin.params.LoginParam;
 import com.cnbm.admin.service.CaptchaService;
+import com.cnbm.admin.service.SysLogLoginService;
 import com.cnbm.admin.utils.JwtUtil;
 import com.cnbm.admin.service.LoginService;
 import com.cnbm.admin.utils.ResponseResult;
 import com.cnbm.common.exception.ErrorCode;
+import com.cnbm.common.utils.IpUtils;
+import com.cnbm.common.utils.Result;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -16,6 +24,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -37,16 +46,30 @@ public class LoginServiceImpl implements LoginService {
     @Autowired
     private CaptchaService captchaService;
 
+    @Autowired
+    private SysLogLoginService sysLogLoginService;
+
     @Override
-    public ResponseResult login(HttpServletRequest request, LoginParam loginParam) {
+    public Result login(HttpServletRequest request, LoginParam loginParam) {
         //验证码是否正确
-        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
-        if(!flag){
-            return new ResponseResult(ErrorCode.CAPTCHA_ERROR,"验证码错误");
-        }
+//        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
+//        if(!flag){
+//            return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
+//        }
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword());
         Authentication authenticate = authenticationManager.authenticate(authenticationToken);
+        //登录日志
+        SysLogLoginEntity log = new SysLogLoginEntity();
+        log.setOperation(LoginOperationEnum.LOGIN.value());
+        log.setCreateDate(new Date());
+        log.setIp(IpUtils.getIpAddr(request));
+        log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+        log.setCreatorName(loginParam.getUsername());
+
         if (Objects.isNull(authenticate)) {
+            log.setStatus(LoginStatusEnum.FAIL.value());
+            log.setCreatorName(loginParam.getUsername());
+            sysLogLoginService.save(log);
             throw new RuntimeException("登录失败");
         }
         //如果认证通过了，使用userid生成一个jwt jwt存入ResponseResult返回
@@ -57,7 +80,33 @@ public class LoginServiceImpl implements LoginService {
         map.put("token",jwt);
         //把完整的用户信息存入redis  userid作为key
         redisTemplate.opsForValue().set("login:"+userid,loginUser);
-        return new ResponseResult(200,"登录成功",map);
+        //登录成功
+        log.setStatus(LoginStatusEnum.SUCCESS.value());
+        log.setCreator(loginUser.getSysUserEntity().getId());
+        log.setCreatorName(loginUser.getUsername());
+        sysLogLoginService.save(log);
+        return new Result<>().ok(map);
+    }
+
+    @Override
+    public void logout(HttpServletRequest request) {
+        //获取SecurityContextHolder中的用户id
+        UsernamePasswordAuthenticationToken authentication = (UsernamePasswordAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        Long userid = loginUser.getSysUserEntity().getId();
+        //日志
+		SysLogLoginEntity log = new SysLogLoginEntity();
+		log.setOperation(LoginOperationEnum.LOGOUT.value());
+		log.setIp(IpUtils.getIpAddr(request));
+		log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+		log.setIp(IpUtils.getIpAddr(request));
+		log.setStatus(LoginStatusEnum.SUCCESS.value());
+		log.setCreator(userid);
+		log.setCreatorName(loginUser.getUsername());
+		log.setCreateDate(new Date());
+		sysLogLoginService.save(log);
+        //删除redis中的值
+        redisTemplate.delete("login:"+userid);
     }
 
 }

ym-admin/src/main/java/com/cnbm/admin/service/impl/SysLogLoginServiceImpl.java

@@ -0,0 +1,59 @@
+package com.cnbm.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.dao.SysLogLoginDao;
+import com.cnbm.admin.dto.SysLogLoginDTO;
+import com.cnbm.admin.entity.SysLogLoginEntity;
+import com.cnbm.admin.service.SysLogLoginService;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.impl.BaseServiceImpl;
+import com.cnbm.common.utils.ConvertUtils;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Log4j2
+public class SysLogLoginServiceImpl extends BaseServiceImpl<SysLogLoginDao, SysLogLoginEntity> implements SysLogLoginService {
+
+    @Override
+    public PageData<SysLogLoginDTO> page(Map<String, Object> params) {
+        IPage<SysLogLoginEntity> page = baseDao.selectPage(
+                getPage(params, Constant.CREATE_DATE, false),
+                getWrapper(params)
+        );
+        log.info("page======{}",page.toString());
+
+        return getPageData(page, SysLogLoginDTO.class);
+    }
+
+    @Override
+    public List<SysLogLoginDTO> list(Map<String, Object> params) {
+        List<SysLogLoginEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, SysLogLoginDTO.class);
+    }
+
+    private QueryWrapper<SysLogLoginEntity> getWrapper(Map<String, Object> params){
+        String status = (String) params.get("status");
+        String creatorName = (String) params.get("creatorName");
+
+        QueryWrapper<SysLogLoginEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(status), "status", status);
+        wrapper.like(StringUtils.isNotBlank(creatorName), "creator_name", creatorName);
+        return wrapper;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(SysLogLoginEntity entity) {
+        insert(entity);
+    }
+
+}

ym-admin/src/main/java/com/cnbm/admin/service/impl/UserDetailsServiceImpl.java

@@ -5,23 +5,24 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cnbm.admin.dto.SysMenuDTO;
 import com.cnbm.admin.dto.SysUserDTO;
 import com.cnbm.admin.entity.LoginUser;
+import com.cnbm.admin.entity.SysLogLoginEntity;
 import com.cnbm.admin.entity.SysMenuEntity;
 import com.cnbm.admin.entity.SysUserEntity;
+import com.cnbm.admin.enums.LoginOperationEnum;
 import com.cnbm.admin.exception.LoginStatusException;
 import com.cnbm.admin.service.SysMenuService;
 import com.cnbm.common.utils.ConvertUtils;
+import com.cnbm.common.utils.IpUtils;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -45,6 +46,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
         LambdaQueryWrapper<SysUserEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(SysUserEntity::getUsername,username);
         SysUserEntity sysUserEntity = userDao.selectOne(lambdaQueryWrapper);
+
         if (Objects.isNull(sysUserEntity)) {
             throw new UsernameNotFoundException("用户名不存在");
         }

ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java

@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2018.
+ * http://www.ulabcare.com
+ */
+
+package com.cnbm.admin.utils;
+
+import com.cnbm.admin.entity.LoginUser;
+import com.cnbm.admin.entity.SysUserEntity;
+import com.cnbm.admin.enums.WhetherEnum;
+import lombok.Builder;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 接口支持基类
+ *
+ * @author jiff
+ * @date 2018/11/1
+ * @since 1.0
+ */
+public abstract class BaseSupportUtils {
+
+    /**
+     * 获取当前登录用户信息
+     *
+     * @return
+     */
+    private static SysUserEntity getLoginUser() {
+        //登录用户信息
+        UsernamePasswordAuthenticationToken authentication = (UsernamePasswordAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        return loginUser.getSysUserEntity();
+    }
+
+    /**
+     * 设置公共字段值，一般用于创建新记录，包含以下字段：
+     *
+     * <p>
+     * {@link CommonField#enabled}<br>
+     * {@link CommonField#valid}<br>
+     * {@link CommonField#creatorId}<br>
+     * {@link CommonField#creatorName}<br>
+     * {@link CommonField#createTime}<br>
+     * {@link CommonField#updaterId}<br>
+     * {@link CommonField#updaterName}<br>
+     * {@link CommonField#updateTime}<br>
+     * </p>
+     *
+     * @param t                需要设置的对象
+     * @param ignoreProperties 忽略的字段
+     * @param <T>
+     */
+    public static <T extends Serializable> T setCommonField(T t, String... ignoreProperties) {
+        CommonField commonField = CommonField.builder()
+                .enabled(WhetherEnum.YES.getValue())
+                .valid(WhetherEnum.YES.getValue())
+                .createTime(LocalDateTime.now())
+                .creatorId(getLoginUser().getId())
+                .creatorName(getLoginUser().getUsername())
+                .updateTime(LocalDateTime.now())
+                .updaterId(getLoginUser().getId())
+                .updaterName(getLoginUser().getUsername())
+                .build();
+        BeanUtils.copyProperties(commonField, t, ignoreProperties);
+        return t;
+    }
+
+    /**
+     * 设置更新的公共字段值，一般用于更新记录，包含以下字段：
+     *
+     * <p>
+     * {@link CommonField#updaterId}<br>
+     * {@link CommonField#updaterName}<br>
+     * {@link CommonField#updateTime}<br>
+     * </p>
+     *
+     * @param t   需要设置的对象
+     * @param <T>
+     */
+    public static <T extends Serializable> T setUpdateCommonField(T t) {
+        CommonField commonField = CommonField.builder()
+                .updaterId(getLoginUser().getId())
+                .updaterName(getLoginUser().getUsername())
+                .updateTime(LocalDateTime.now())
+                .build();
+        BeanUtils.copyProperties(commonField, t, "enabled", "valid");
+        return t;
+    }
+
+    @Data
+    @Builder
+    private static class CommonField implements Serializable {
+        /**
+         * 启用状态:0 、停用，1、启用
+         */
+        private Integer enabled;
+        /**
+         * 删除标志，是否有效:1 可用 0不可用
+         */
+        private Integer valid;
+
+
+        /**
+         * 创建人
+         */
+        private Long creatorId;
+        /**
+         * 创建人
+         */
+        private String creatorName;
+        /**
+         * 创建时间
+         */
+        private LocalDateTime createTime;
+
+
+        /**
+         * 更新人
+         */
+        private Long updaterId;
+        /**
+         * 更新人
+         */
+        private String updaterName;
+        /**
+         * 更新时间
+         */
+        private LocalDateTime updateTime;
+    }
+}

ym-admin/src/main/resources/mapper/SysLogLoginDao.xml

@@ -1,5 +1,6 @@
 <?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.basic.mapper.TeamMapper">
 
-</mapper>
+<mapper namespace="com.cnbm.admin.dao.SysLogLoginDao">
+
+</mapper>

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

@@ -53,16 +53,15 @@ public class FactoryController {
         @ApiImplicitParam(name = "type", value = "工厂类型", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:factory:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:page')")
     public Result<PageData<FactoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<FactoryDTO> page = factoryService.page(params);
-
         return new Result<PageData<FactoryDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:info')")
     public Result<FactoryDTO> get(@PathVariable("id") Long id){
         FactoryDTO data = factoryService.get(id);
 
@@ -71,8 +70,8 @@ public class FactoryController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:save')")
     public Result save(@RequestBody FactoryDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -84,21 +83,19 @@ public class FactoryController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:update')")
     public Result update(@RequestBody FactoryDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-
         factoryService.update(dto);
-
         return new Result();
     }
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -110,21 +107,27 @@ public class FactoryController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<FactoryDTO> list = factoryService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, FactoryExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Factory", list, FactoryExcel.class);
     }
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         factoryService.changeStatus(id.getId());
 
         return new Result();
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取工厂列表")
+    @LogOperation("获取工厂列表")
+    public List<FactoryDTO> list() {
+        return factoryService.list();
+    }
 }

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

@@ -0,0 +1,142 @@
+package com.cnbm.basic.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.basic.dto.FeaturesStageProcedureRelationDTO;
+import com.cnbm.basic.excel.FeaturesStageProcedureRelationExcel;
+import com.cnbm.basic.service.IFeaturesStageProcedureRelationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+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-09-01
+ */
+@RestController
+@RequestMapping("/basic/featuresStageProcedureRelation")
+@Api(tags="过程检验-工艺-检验参数 关系表 ")
+public class FeaturesStageProcedureRelationController {
+    @Autowired
+    private IFeaturesStageProcedureRelationService featuresStageProcedureRelationService;
+
+    @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),
+        @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:page')")
+    public Result<PageData<FeaturesStageProcedureRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<FeaturesStageProcedureRelationDTO> page = featuresStageProcedureRelationService.page(params);
+
+        return new Result<PageData<FeaturesStageProcedureRelationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:info')")
+    public Result<FeaturesStageProcedureRelationDTO> get(@PathVariable("id") Long id){
+        FeaturesStageProcedureRelationDTO data = featuresStageProcedureRelationService.get(id);
+
+        return new Result<FeaturesStageProcedureRelationDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:save')")
+    public Result<Long> save(@RequestBody FeaturesStageProcedureRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        featuresStageProcedureRelationService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:update')")
+    public Result<Long> update(@RequestBody FeaturesStageProcedureRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        featuresStageProcedureRelationService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        featuresStageProcedureRelationService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<FeaturesStageProcedureRelationDTO> list = featuresStageProcedureRelationService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, FeaturesStageProcedureRelationExcel.class);
+    }
+
+    @PostMapping("batchInsert")
+    @ApiOperation("批量保存")
+    public Result<Long> batchInsert(@RequestBody FeaturesStageProcedureRelationDTO[] lists){
+        //效验数据
+        //ValidatorUtils.validateEntity(lists, AddGroup.class, DefaultGroup.class);
+
+        featuresStageProcedureRelationService.batchInsert(lists);
+
+        return new Result();
+    }
+
+    @DeleteMapping("deleteByStageProcedure")
+    @ApiOperation("删除 依据工序id 检验阶段")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "productId", value = "产品", paramType = "query", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "inspectionStage", value = "检测阶段", paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "workingProcedureId", value = "工序", paramType = "query", dataTypeClass = Long.class)
+    })
+    public Result deleteByStageProcedure(@ApiIgnore @RequestParam Map<String, Object> params){
+
+        featuresStageProcedureRelationService.deleteByStageProcedure(params);
+
+        return new Result();
+    }
+
+}

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

@@ -2,7 +2,6 @@ package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.admin.params.IdParam;
-import com.cnbm.basic.vo.MachineVo;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -49,15 +48,18 @@ public class MachineController {
         @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),
+        @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:machine:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:page')")
     public Result<PageData<MachineDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<MachineDTO> page = machineService.page(params);
 
         return new Result<PageData<MachineDTO>>().ok(page);
     }
 
+    /*
     @GetMapping("page2")
     @ApiOperation("分页2")
     @ApiImplicitParams({
@@ -67,16 +69,17 @@ public class MachineController {
             @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
             @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:machine:page')")
-    public Result<PageData<MachineVo>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
-        PageData<MachineVo> page = machineService.page1(params);
+    //@PreAuthorize("@ex.hasAuthority('basic:machine:page')")
+    public Result<PageData<MachineDTO>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<MachineDTO> page = machineService.page1(params);
 
-        return new Result<PageData<MachineVo>>().ok(page);
+        return new Result<PageData<MachineDTO>>().ok(page);
     }
+     */
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:info')")
     public Result<MachineDTO> get(@PathVariable("id") Long id){
         MachineDTO data = machineService.get(id);
 
@@ -85,8 +88,8 @@ public class MachineController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:save')")
     public Result save(@RequestBody MachineDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -98,8 +101,8 @@ public class MachineController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:update')")
     public Result update(@RequestBody MachineDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -111,8 +114,8 @@ public class MachineController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -124,21 +127,29 @@ public class MachineController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<MachineDTO> list = machineService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Machine", list, MachineExcel.class);
     }
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         machineService.changeStatus(id.getId());
 
         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/MeasureToolController.java

@@ -52,7 +52,7 @@ public class MeasureToolController {
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:page')")
     public Result<PageData<MeasureToolDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<MeasureToolDTO> page = measureToolService.page(params);
 
@@ -61,7 +61,7 @@ public class MeasureToolController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:info')")
     public Result<MeasureToolDTO> get(@PathVariable("id") Long id){
         MeasureToolDTO data = measureToolService.get(id);
 
@@ -70,8 +70,8 @@ public class MeasureToolController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:save')")
     public Result save(@RequestBody MeasureToolDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -83,8 +83,8 @@ public class MeasureToolController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:update')")
     public Result update(@RequestBody MeasureToolDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -96,8 +96,8 @@ public class MeasureToolController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -109,8 +109,8 @@ public class MeasureToolController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<MeasureToolDTO> list = measureToolService.list(params);
 
@@ -119,10 +119,17 @@ public class MeasureToolController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         measureToolService.changeStatus(id.getId());
 
         return new Result();
     }
+
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取量具列表")
+    @LogOperation("获取控制图形列表")
+    public List<MeasureToolDTO> list() {
+        return measureToolService.list();
+    }
 }

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

@@ -48,9 +48,11 @@ public class PlatformController {
         @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),
+        @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:platform:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:page')")
     public Result<PageData<PlatformDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<PlatformDTO> page = platformService.page(params);
 
@@ -59,7 +61,7 @@ public class PlatformController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:info')")
     public Result<PlatformDTO> get(@PathVariable("id") Long id){
         PlatformDTO data = platformService.get(id);
 
@@ -68,8 +70,8 @@ public class PlatformController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:save')")
     public Result save(@RequestBody PlatformDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +83,8 @@ public class PlatformController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:update')")
     public Result update(@RequestBody PlatformDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +96,8 @@ public class PlatformController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,17 +109,17 @@ public class PlatformController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<PlatformDTO> list = platformService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, PlatformExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Platform", list, PlatformExcel.class);
     }
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         platformService.changeStatus(id.getId());
 

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

@@ -14,6 +14,7 @@ import com.cnbm.common.validator.group.UpdateGroup;
 import com.cnbm.basic.dto.ProductDTO;
 import com.cnbm.basic.excel.ProductExcel;
 import com.cnbm.basic.service.IProductService;
+import com.cnbm.common.vo.IdVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -54,7 +55,7 @@ public class ProductController {
         @ApiImplicitParam(name = "product_type_id", value = "产品类型id", paramType = "query", dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "inspection_stage", value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验", paramType = "query", dataTypeClass = String.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:product:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:page')")
     public Result<PageData<ProductDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductDTO> page = productService.page(params);
 
@@ -63,30 +64,30 @@ public class ProductController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:product:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:info')")
     public Result<ProductDTO> get(@PathVariable("id") Long id){
         ProductDTO data = productService.get(id);
 
         return new Result<ProductDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:product:save')")
-    public Result save(@RequestBody ProductDTO dto){
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:product:save')")
+    public IdVo save(@RequestBody ProductDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        productService.save(dto);
+        return productService.add(dto);
 
-        return new Result();
+        //return new Result();
     }
 
-    @PutMapping
+    @PutMapping("update")
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:product:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:product:update')")
     public Result update(@RequestBody ProductDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -96,10 +97,10 @@ public class ProductController {
         return new Result();
     }
 
-    @DeleteMapping
+    @DeleteMapping("delete")
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:product:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:product:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -111,8 +112,8 @@ public class ProductController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:product:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:product:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductDTO> list = productService.list(params);
 
@@ -121,11 +122,18 @@ public class ProductController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         productService.changeStatus(id.getId());
 
         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/ProductFactoryRelationController.java

@@ -1,6 +1,7 @@
 package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.basic.dto.ProductWorkingprocedureRelationDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -49,7 +50,7 @@ public class ProductFactoryRelationController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:page')")
     public Result<PageData<ProductFactoryRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductFactoryRelationDTO> page = productFactoryRelationService.page(params);
 
@@ -58,7 +59,7 @@ public class ProductFactoryRelationController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:info')")
     public Result<ProductFactoryRelationDTO> get(@PathVariable("id") Long id){
         ProductFactoryRelationDTO data = productFactoryRelationService.get(id);
 
@@ -67,8 +68,8 @@ public class ProductFactoryRelationController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:save')")
     public Result save(@RequestBody ProductFactoryRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +81,8 @@ public class ProductFactoryRelationController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:update')")
     public Result update(@RequestBody ProductFactoryRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +94,8 @@ public class ProductFactoryRelationController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,12 +107,22 @@ public class ProductFactoryRelationController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductFactoryRelationDTO> list = productFactoryRelationService.list(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, ProductFactoryRelationExcel.class);
     }
 
+    @PostMapping("batchInsertFactory")
+    @ApiOperation("添加多个工厂关联")
+    @LogOperation("添加多个工厂关联")
+    public Result batchInsertFactory(@RequestBody ProductFactoryRelationDTO[] lists){
+
+        productFactoryRelationService.batchInsertFactory(lists);
+
+        return new Result();
+    }
+
 }

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

@@ -1,6 +1,9 @@
 package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.admin.params.IdParam;
+import com.cnbm.basic.dto.*;
+import com.cnbm.basic.entity.ProductFeatures;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -10,7 +13,6 @@ 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.basic.dto.ProductFeaturesDTO;
 import com.cnbm.basic.excel.ProductFeaturesExcel;
 import com.cnbm.basic.service.IProductFeaturesService;
 import io.swagger.annotations.Api;
@@ -49,7 +51,7 @@ public class ProductFeaturesController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:page')")
     public Result<PageData<ProductFeaturesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductFeaturesDTO> page = productFeaturesService.page(params);
 
@@ -58,7 +60,7 @@ public class ProductFeaturesController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:info')")
     public Result<ProductFeaturesDTO> get(@PathVariable("id") Long id){
         ProductFeaturesDTO data = productFeaturesService.get(id);
 
@@ -67,8 +69,8 @@ public class ProductFeaturesController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:save')")
     public Result save(@RequestBody ProductFeaturesDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +82,8 @@ public class ProductFeaturesController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:update')")
     public Result update(@RequestBody ProductFeaturesDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +95,8 @@ public class ProductFeaturesController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,12 +108,68 @@ public class ProductFeaturesController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:export')")
+    @LogOperation("导出")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "productId", value = "产品", paramType = "query", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "inspectionStage", value = "检测阶段", paramType = "query", dataTypeClass = Integer.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<ProductFeaturesDTO> list = productFeaturesService.list(params);
+        List<ProductFeaturesDTO> list = productFeaturesService.getFeaturesList(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, ProductFeaturesExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "ProductFeatures", list, ProductFeaturesExcel.class);
+    }
+
+    @PostMapping("getProductFeaturesByProductId")
+    @ApiOperation("查询产品特性 依据产品id")
+    public Result<List<ProductFeaturesDTO>> getProductFeaturesByProductId(@RequestBody IdParam id){
+        List<ProductFeaturesDTO> list = productFeaturesService.getProductFeaturesByProductId(id.getId());
+        return new Result<List<ProductFeaturesDTO>>().ok(list);
+    }
+
+    @PostMapping("getFeaturesByStageProcedure")
+    @ApiOperation("查询依据工序id 检验阶段")
+    @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<List<FeaturesProcedureDTO>> getFeaturesByStageProcedure(@ApiIgnore @RequestParam Map<String, Object> params){
+        List<FeaturesProcedureDTO> list = productFeaturesService.getFeaturesByStageProcedure(params);
+        return new Result<List<FeaturesProcedureDTO>>().ok(list);
+    }
+
+    @PutMapping("batchUpdate")
+    @ApiOperation("批量更新特性")
+    public Result batchUpdate(@RequestBody ProductFeaturesDTO[] lists){
+
+        productFeaturesService.batchUpdate(lists);
+
+        return new Result();
+    }
+
+    @PostMapping("getFeaturesList")
+    @ApiOperation("特性列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "productId", value = "产品", paramType = "query", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "inspectionStage", value = "检测阶段", paramType = "query", dataTypeClass = Integer.class)
+    })
+    public Result<List<ProductFeaturesDTO>> getFeaturesList(@ApiIgnore @RequestParam Map<String, Object> params){
+        List<ProductFeaturesDTO> list = productFeaturesService.getFeaturesList(params);
+        return new Result<List<ProductFeaturesDTO>>().ok(list);
+    }
+
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取特性列表")
+    @LogOperation("获取特性列表")
+    public List<ProductFeaturesDTO> list() {
+        return productFeaturesService.list();
+    }
+
+    @PostMapping("getProductFeaturesByType")
+    @ApiOperation("根据特性类型 获取特性列表 计量型1 计数型2")
+    public List<ProductFeaturesDTO> getProductFeaturesByType(Integer type){
+        return productFeaturesService.getProductFeaturesByType(type);
     }
 
 }

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

@@ -49,7 +49,7 @@ public class ProductFeaturesHisController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:page')")
     public Result<PageData<ProductFeaturesHisDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductFeaturesHisDTO> page = productFeaturesHisService.page(params);
 
@@ -58,7 +58,7 @@ public class ProductFeaturesHisController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:info')")
     public Result<ProductFeaturesHisDTO> get(@PathVariable("id") Long id){
         ProductFeaturesHisDTO data = productFeaturesHisService.get(id);
 
@@ -67,8 +67,8 @@ public class ProductFeaturesHisController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:save')")
     public Result save(@RequestBody ProductFeaturesHisDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class ProductFeaturesHisController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:update')")
     public Result update(@RequestBody ProductFeaturesHisDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class ProductFeaturesHisController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,8 +106,8 @@ public class ProductFeaturesHisController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductFeaturesHisDTO> list = productFeaturesHisService.list(params);
 

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

@@ -2,6 +2,7 @@ package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.admin.params.IdParam;
+import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -53,7 +54,7 @@ public class ProductTypeController {
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-//    @PreAuthorize("@ex.hasAuthority('code:productType:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:page')")
     public Result<PageData<ProductTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductTypeDTO> page = productTypeService.page(params);
 
@@ -62,7 +63,7 @@ public class ProductTypeController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:info')")
     public Result<ProductTypeDTO> get(@PathVariable("id") Long id){
         ProductTypeDTO data = productTypeService.get(id);
 
@@ -71,8 +72,8 @@ public class ProductTypeController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:save')")
     public Result save(@RequestBody ProductTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -84,8 +85,8 @@ public class ProductTypeController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:update')")
     public Result update(@RequestBody ProductTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -97,8 +98,8 @@ public class ProductTypeController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -110,8 +111,8 @@ public class ProductTypeController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductTypeDTO> list = productTypeService.list(params);
 
@@ -120,11 +121,16 @@ public class ProductTypeController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         productTypeService.changeStatus(id.getId());
 
         return new Result();
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取产品类型列表")
+    public List<ProductTypeDTO> list() {
+        return productTypeService.list();
+    }
 }

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

@@ -1,7 +1,9 @@
 package com.cnbm.basic.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.cnbm.admin.annotation.LogOperation;
-import com.cnbm.basic.dto.WorkingProcedureDTO;
+import com.cnbm.admin.params.IdParam;
+import com.cnbm.basic.dto.SequenceDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -50,7 +52,7 @@ public class ProductWorkingprocedureRelationController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:page')")
     public Result<PageData<ProductWorkingprocedureRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductWorkingprocedureRelationDTO> page = productWorkingprocedureRelationService.page(params);
 
@@ -59,7 +61,7 @@ public class ProductWorkingprocedureRelationController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:info')")
     public Result<ProductWorkingprocedureRelationDTO> get(@PathVariable("id") Long id){
         ProductWorkingprocedureRelationDTO data = productWorkingprocedureRelationService.get(id);
 
@@ -68,21 +70,26 @@ public class ProductWorkingprocedureRelationController {
 
     @PostMapping("save")
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:save')")
     public Result save(@RequestBody ProductWorkingprocedureRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
         productWorkingprocedureRelationService.save(dto);
 
-        return new Result();
+        if(ObjectUtils.isNotNull(dto.getWorkingProcedureId())) {
+            return new Result();
+        }
+        else{
+            return new Result().error(1,"该工艺已经绑定");
+        }
     }
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:update')")
     public Result update(@RequestBody ProductWorkingprocedureRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +101,8 @@ public class ProductWorkingprocedureRelationController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,17 +114,17 @@ public class ProductWorkingprocedureRelationController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductWorkingprocedureRelationDTO> list = productWorkingprocedureRelationService.list(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, ProductWorkingprocedureRelationExcel.class);
     }
 
-    @GetMapping("{productId}")
+    @GetMapping("getWorkingprocedureByProductId/{productId}")
     @ApiOperation("查询所有工序 依据产品id")
-    //@LogOperation("查询所有工序 依据产品id")
+    @LogOperation("查询所有工序 依据产品id")
     public Result<List<ProductWorkingprocedureRelationDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){
         List<ProductWorkingprocedureRelationDTO> list = productWorkingprocedureRelationService.getWorkingprocedureByProductId(productId);
         return new Result<List<ProductWorkingprocedureRelationDTO>>().ok(list);
@@ -125,8 +132,8 @@ public class ProductWorkingprocedureRelationController {
 
     @PostMapping("batchInsertWorkingprocedure")
     @ApiOperation("添加工序流程")
-    //@LogOperation("添加工序流程")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:batchInsertWorkingprocedure')")
+    @LogOperation("添加工序流程")
+    //@PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:batchInsertWorkingprocedure')")
     public Result batchInsertWorkingprocedure(@RequestBody ProductWorkingprocedureRelationDTO[] lists){
 
         productWorkingprocedureRelationService.batchInsertWorkingprocedure(lists);
@@ -134,4 +141,30 @@ public class ProductWorkingprocedureRelationController {
         return new Result();
     }
 
+    @PutMapping("sequenceUp")
+    @ApiOperation("产品工序上移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "productId", value = "产品", paramType = "query", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "index", value = "产品工序序号", paramType = "query", dataTypeClass = Integer.class)
+//    })
+    public Result sequenceUp(@RequestBody SequenceDTO sequenceDTO){
+
+        productWorkingprocedureRelationService.sequenceUp(sequenceDTO);
+
+        return new Result();
+    }
+
+    @PutMapping("sequenceDown")
+    @ApiOperation("产品工序下移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "productId", value = "产品", paramType = "query", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "index", value = "产品工序序号", paramType = "query", dataTypeClass = Integer.class)
+//    })
+    public Result sequenceDown(@RequestBody SequenceDTO sequenceDTO){
+
+        productWorkingprocedureRelationService.sequenceDown(sequenceDTO);
+
+        return new Result();
+    }
+
 }

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

@@ -49,7 +49,7 @@ public class ShiftController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:shift:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:page')")
     public Result<PageData<ShiftDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ShiftDTO> page = shiftService.page(params);
 
@@ -58,7 +58,7 @@ public class ShiftController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:info')")
     public Result<ShiftDTO> get(@PathVariable("id") Long id){
         ShiftDTO data = shiftService.get(id);
 
@@ -67,8 +67,8 @@ public class ShiftController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:save')")
     public Result save(@RequestBody ShiftDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class ShiftController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:update')")
     public Result update(@RequestBody ShiftDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class ShiftController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,12 +106,19 @@ public class ShiftController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ShiftDTO> list = shiftService.list(params);
 
         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;
@@ -49,7 +50,7 @@ public class TeamController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:team:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:page')")
     public Result<PageData<TeamDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<TeamDTO> page = teamService.page(params);
 
@@ -58,7 +59,7 @@ public class TeamController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:team:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:info')")
     public Result<TeamDTO> get(@PathVariable("id") Long id){
         TeamDTO data = teamService.get(id);
 
@@ -67,8 +68,8 @@ public class TeamController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:team:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:team:save')")
     public Result save(@RequestBody TeamDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +81,8 @@ public class TeamController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:team:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:team:update')")
     public Result update(@RequestBody TeamDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +94,8 @@ public class TeamController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:team:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:team:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,12 +107,17 @@ public class TeamController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:team:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:team:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<TeamDTO> list = teamService.list(params);
 
         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/controller/UnitController.java

@@ -20,10 +20,12 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.groups.Default;
 import java.util.List;
 import java.util.Map;
 
@@ -48,9 +50,11 @@ public class UnitController {
         @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),
+        @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:unit:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:page')")
     public Result<PageData<UnitDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<UnitDTO> page = unitService.page(params);
 
@@ -59,7 +63,7 @@ public class UnitController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:info')")
+    //@PreAuthorize("@ex.hasAuthority('basic:unit:info')")
     public Result<UnitDTO> get(@PathVariable("id") Long id){
         UnitDTO data = unitService.get(id);
 
@@ -68,8 +72,8 @@ public class UnitController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:save')")
     public Result save(@RequestBody UnitDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +85,8 @@ public class UnitController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:update')")
     public Result update(@RequestBody UnitDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +98,8 @@ public class UnitController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,21 +111,27 @@ public class UnitController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<UnitDTO> list = unitService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Unit", list, UnitExcel.class);
     }
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         unitService.changeStatus(id.getId());
 
         return new Result();
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取单位列表")
+    @LogOperation("获取单位列表")
+    public List<UnitDTO> list() {
+        return unitService.list();
+    }
 }

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

@@ -2,6 +2,9 @@ package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.admin.params.IdParam;
+import com.cnbm.basic.dto.UnitDTO;
+import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
+import com.cnbm.basic.entity.WorkingProcedure;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -52,7 +55,7 @@ public class WorkingProcedureController {
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:page')")
     public Result<PageData<WorkingProcedureDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<WorkingProcedureDTO> page = workingProcedureService.page(params);
 
@@ -61,7 +64,7 @@ public class WorkingProcedureController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:info')")
     public Result<WorkingProcedureDTO> get(@PathVariable("id") Long id){
         WorkingProcedureDTO data = workingProcedureService.get(id);
 
@@ -70,8 +73,8 @@ public class WorkingProcedureController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:save')")
     public Result save(@RequestBody WorkingProcedureDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -83,8 +86,8 @@ public class WorkingProcedureController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:update')")
     public Result update(@RequestBody WorkingProcedureDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -96,8 +99,8 @@ public class WorkingProcedureController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -109,8 +112,8 @@ public class WorkingProcedureController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<WorkingProcedureDTO> list = workingProcedureService.list(params);
 
@@ -119,19 +122,36 @@ public class WorkingProcedureController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         workingProcedureService.changeStatus(id.getId());
 
         return new Result();
     }
 
-    @GetMapping("getWorkingprocedureByProductId")
+    @GetMapping("getWorkingprocedureByProductId/{productId}")
     @ApiOperation("查询所有工序 依据产品id")
-    //@LogOperation("查询所有工序 依据产品id")
+    @LogOperation("查询所有工序 依据产品id")
     public Result<List<WorkingProcedureDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){
         List<WorkingProcedureDTO> list = workingProcedureService.getWorkingProcedureByProductId(productId);
         return new Result<List<WorkingProcedureDTO>>().ok(list);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取工序列表")
+    public List<WorkingProcedureDTO> list() {
+        return workingProcedureService.list();
+    }
+
+    @PostMapping(value = "listByType/{typeId}")
+    @ApiOperation(value = "根据工序类型 获取工序列表")
+    public List<WorkingProcedure> listByType(@PathVariable("typeId") Long typeId) {
+        return workingProcedureService.listByType(typeId);
+    }
+
+    @PostMapping(value = "listWithType")
+    @ApiOperation(value = "工序类型及对应工序列表")
+    public List<WorkingProcedureTypeDTO> listWithType () {
+        return workingProcedureService.listWithType();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.admin.params.IdParam;
+import com.cnbm.basic.dto.WorkingProcedureDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -48,9 +49,11 @@ public class WorkingProcedureTypeController {
         @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),
+        @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:page')")
     public Result<PageData<WorkingProcedureTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<WorkingProcedureTypeDTO> page = workingProcedureTypeService.page(params);
 
@@ -59,7 +62,7 @@ public class WorkingProcedureTypeController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:info')")
     public Result<WorkingProcedureTypeDTO> get(@PathVariable("id") Long id){
         WorkingProcedureTypeDTO data = workingProcedureTypeService.get(id);
 
@@ -68,8 +71,8 @@ public class WorkingProcedureTypeController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:save')")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:save')")
     public Result save(@RequestBody WorkingProcedureTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +84,8 @@ public class WorkingProcedureTypeController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:update')")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:update')")
     public Result update(@RequestBody WorkingProcedureTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +97,8 @@ public class WorkingProcedureTypeController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:delete')")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,21 +110,27 @@ public class WorkingProcedureTypeController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:export')")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<WorkingProcedureTypeDTO> list = workingProcedureTypeService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureTypeExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "WorkingProcedureType", list, WorkingProcedureTypeExcel.class);
     }
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         workingProcedureTypeService.changeStatus(id.getId());
 
         return new Result();
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取工序类型列表")
+    private List<WorkingProcedureTypeDTO> list(@ApiIgnore @RequestParam Map<String, Object> params) {
+        return workingProcedureTypeService.list(params);
+    }
+
 }

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

@@ -0,0 +1,18 @@
+package com.cnbm.basic.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "工艺特性-工序 DTO对象")
+public class FeaturesProcedureDTO implements Serializable {
+
+    @ApiModelProperty(value = "检验参数id,关联product_features表")
+    private Long productFeaturesId;
+
+    @ApiModelProperty(value = "工序id,关联 working_procedure 表")
+    private Long workingProcedureId;
+}

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

@@ -0,0 +1,63 @@
+package com.cnbm.basic.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since  2022-09-01
+ */
+@Data
+@ApiModel(value = "过程检验-工艺-检验参数 关系表 DTO对象")
+public class FeaturesStageProcedureRelationDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "检验参数id,关联product_features表")
+	private Long productFeaturesId;
+
+	@ApiModelProperty(value = "工序id,关联 working_procedure 表")
+	private Long workingProcedureId;
+
+	@ApiModelProperty(value = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+	private Integer inspectionStage;
+
+	@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-baisc/src/main/java/com/cnbm/basic/dto/ProductDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -82,4 +83,7 @@ public class ProductDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "工厂")
+	private List<Long> factoryList;
+
 }

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;
 
@@ -29,9 +28,15 @@ public class ProductFeaturesDTO implements Serializable {
 	@ApiModelProperty(value = "量具id，关联measure_tool表")
 	private Long measureToolId;
 
+	@ApiModelProperty(value = "量具名称，关联measure_tool表")
+	private String measureToolName;
+
 	@ApiModelProperty(value = "单位 id，关联unit表")
 	private Long unitId;
 
+	@ApiModelProperty(value = "单位名称，关联unit表")
+	private String unitName;
+
 	@ApiModelProperty(value = "产品特性 名")
 	private String name;
 
@@ -56,12 +61,12 @@ public class ProductFeaturesDTO implements Serializable {
 	@ApiModelProperty(value = "检验参数  规格上线")
 	private Float usl;
 
-	@ApiModelProperty(value = "工序id，关联 working_procedure 表id")
-	private Long workingProcedureId;
-
 	@ApiModelProperty(value = "分析图形，关联control_graph表id")
 	private Long controlGraphId;
 
+	@ApiModelProperty(value = "分析图形名，关联control_graph表id")
+	private String controlGraphName;
+
 	@ApiModelProperty(value = "是否需要spc分析，1 yes;0 no")
 	private Integer isSpc;
 
@@ -107,4 +112,10 @@ public class ProductFeaturesDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "工序id,关联 working_procedure 表")
+	private Long workingProcedureId;
+
+	@ApiModelProperty(value = "工序 名,关联working_procedure表")
+	private String workingProcedureName;
+
 }

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

@@ -18,8 +18,6 @@ import java.time.LocalDateTime;
 public class ProductFeaturesHisDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-
-
 	@ApiModelProperty(value = "ID")
 	private Long id;
 
@@ -59,9 +57,6 @@ public class ProductFeaturesHisDTO implements Serializable {
 	@ApiModelProperty(value = "检验参数  规格上线")
 	private Float usl;
 
-	@ApiModelProperty(value = "工序id，关联 working_procedure 表id")
-	private Long workingProcedureId;
-
 	@ApiModelProperty(value = "是否需要spc分析，1 yes;0 no")
 	private Integer isSpc;
 

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

@@ -29,7 +29,7 @@ public class ProductTypeDTO implements Serializable {
 	private String code;
 
 	@ApiModelProperty(value = "描述")
-	private String desc;
+	private String descs;
 
 	@ApiModelProperty(value = "1 可用，0 不可用")
 	private Integer status;

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

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @since  2022-07-15
  */
 @Data
-@ApiModel(value = "工序 表DTO对象")
+@ApiModel(value = "产品-工序 关系表DTO对象")
 public class ProductWorkingprocedureRelationDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -33,12 +33,39 @@ public class ProductWorkingprocedureRelationDTO implements Serializable {
 	@ApiModelProperty(value = "工序名称,关联 working_procedure 表")
 	private String workingProcedureName;
 
+	@ApiModelProperty(value = "工序编码,关联 working_procedure 表")
+	private String workingProcedureCode;
+
 	@ApiModelProperty(value = "顺序，工序是有先后顺序的。")
-	private Integer order;
+	private Integer sequence;
 
 	@ApiModelProperty(value = "1 可用，0 不可用")
 	private Integer status;
 
+	@ApiModelProperty(value = "node.shape")
+	private String shape;
+
+	@ApiModelProperty(value = "node.x")
+	private Integer x;
+
+	@ApiModelProperty(value = "node.y")
+	private Integer y;
+
+	@ApiModelProperty(value = "node.width")
+	private Integer width;
+
+	@ApiModelProperty(value = "node.width")
+	private Integer height;
+
+	@ApiModelProperty(value = "node.lable")
+	private String lable;
+
+	@ApiModelProperty(value = "字体颜色")
+	private String fontcolor;
+
+	@ApiModelProperty(value = "背景颜色")
+	private String backcolor;
+
 	@ApiModelProperty(value = "备注")
 	private String remark;
 

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

@@ -0,0 +1,18 @@
+package com.cnbm.basic.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "顺序更新参数")
+public class SequenceDTO implements Serializable {
+
+    @ApiModelProperty(value = "产品id")
+    private Long productId;
+
+    @ApiModelProperty(value = "产品工序序号")
+    private Integer index;
+}

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

@@ -1,11 +1,13 @@
 package com.cnbm.basic.dto;
 
+import com.cnbm.basic.entity.WorkingProcedure;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 工序类型表 表
@@ -59,4 +61,7 @@ public class WorkingProcedureTypeDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "工序列表")
+	private List<WorkingProcedure> workingProcedureList;
+
 }

ym-baisc/src/main/java/com/cnbm/basic/entity/FeaturesStageProcedureRelation.java

@@ -0,0 +1,67 @@
+package com.cnbm.basic.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 过程检验-工艺-检验参数 关系表 
+ * </p>
+ *
+ * @author why
+ * @since 2022-09-01
+ */
+@Data
+@TableName("features_stage_procedure_relation")
+@ApiModel(value = "FeaturesStageProcedureRelation对象", description = "过程检验-工艺-检验参数 关系表 ")
+public class FeaturesStageProcedureRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("检验参数id,关联product_features表")
+    private Long productFeaturesId;
+
+    @ApiModelProperty("工序id,关联 working_procedure 表")
+    private Long workingProcedureId;
+
+    @ApiModelProperty("（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    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-baisc/src/main/java/com/cnbm/basic/entity/ProductFeatures.java

@@ -58,9 +58,6 @@ public class ProductFeatures implements Serializable {
     @ApiModelProperty("检验参数  规格上线")
     private Float usl;
 
-    @ApiModelProperty("工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
-
     @ApiModelProperty("分析图形，关联control_graph表id")
     private Long controlGraphId;
 

ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFeaturesHis.java

@@ -61,9 +61,6 @@ public class ProductFeaturesHis implements Serializable {
     @ApiModelProperty("检验参数  规格上线")
     private Float usl;
 
-    @ApiModelProperty("工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
-
     @ApiModelProperty("是否需要spc分析，1 yes;0 no")
     private Integer isSpc;
 

ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java

@@ -18,7 +18,7 @@ import lombok.Data;
  */
 @Data
 @TableName("product_workingprocedure_relation")
-@ApiModel(value = "ProductWorkingprocedureRelation对象", description = "工序 表")
+@ApiModel(value = "ProductWorkingprocedureRelation对象", description = "产品-工序 关系表")
 public class ProductWorkingprocedureRelation implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,11 +33,35 @@ public class ProductWorkingprocedureRelation implements Serializable {
     private Long workingProcedureId;
 
     @ApiModelProperty("顺序，工序是有先后顺序的。")
-    private Integer order;
+    private Integer sequence;
 
     @ApiModelProperty("1 可用，0 不可用")
     private Integer status;
 
+    @ApiModelProperty("node.shape")
+    private String shape;
+
+    @ApiModelProperty("node.x")
+    private Integer x;
+
+    @ApiModelProperty("node.y")
+    private Integer y;
+
+    @ApiModelProperty("node.width")
+    private Integer width;
+
+    @ApiModelProperty("node.width")
+    private Integer height;
+
+    @ApiModelProperty("node.lable")
+    private String lable;
+
+    @ApiModelProperty("字体颜色")
+    private String fontcolor;
+
+    @ApiModelProperty("背景颜色")
+    private String backcolor;
+
     @ApiModelProperty("备注")
     private String remark;
 

ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java

@@ -15,37 +15,37 @@ import java.util.Date;
  */
 @Data
 public class FactoryExcel {
-    @Excel(name = "ID")
-    private Long id;
-    @Excel(name = "工厂 名")
+//    @Excel(name = "ID")
+//    private Long id;
+    @Excel(name = "工厂名称")
     private String name;
-    @Excel(name = "工厂 编码")
+    @Excel(name = "工厂编码")
     private String code;
-    @Excel(name = "工厂 描述")
+    @Excel(name = "描述")
     private String descs;
-    @Excel(name = "工厂 联系地址")
+    @Excel(name = "联系地址")
     private String address;
-    @Excel(name = "工厂类型，1-内部工厂；2-供应商")
+    @Excel(name = "工厂类型")
     private String 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;
+//    @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-baisc/src/main/java/com/cnbm/basic/excel/FeaturesStageProcedureRelationExcel.java

@@ -0,0 +1,43 @@
+package com.cnbm.basic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since  2022-09-01
+ */
+@Data
+public class FeaturesStageProcedureRelationExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "检验参数id,关联product_features表")
+    private Long productFeaturesId;
+    @Excel(name = "工序id,关联 working_procedure 表")
+    private Long workingProcedureId;
+    @Excel(name = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+    @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-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java

@@ -13,33 +13,35 @@ import java.time.LocalDateTime;
  */
 @Data
 public class MachineExcel {
-    @Excel(name = "ID")
-    private Long id;
+//    @Excel(name = "ID")
+//    private Long id;
     @Excel(name = "机台名")
     private String name;
     @Excel(name = "机台编码")
     private String code;
-    @Excel(name = "机台id，关联platform id")
-    private Long platformId;
-    @Excel(name = "1 可用，0 不可用")
-    private Integer status;
+//    @Excel(name = "机台id，关联platform id")
+//    private Long platformId;
+    @Excel(name = "站点")
+    private String platformName;
+//    @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;
+//    @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-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java

@@ -13,33 +13,33 @@ import java.time.LocalDateTime;
  */
 @Data
 public class PlatformExcel {
-    @Excel(name = "ID")
-    private Long id;
+//    @Excel(name = "ID")
+//    private Long id;
     @Excel(name = "站台名")
     private String name;
     @Excel(name = "站台编码")
     private String code;
     @Excel(name = "站台分组")
     private String platformGroup;
-    @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;
+//    @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-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesExcel.java

@@ -37,8 +37,6 @@ public class ProductFeaturesExcel {
     private Float sl;
     @Excel(name = "检验参数  规格上线")
     private Float usl;
-    @Excel(name = "工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
     @Excel(name = "分析图形，关联control_graph表id")
     private Long controlGraphId;
     @Excel(name = "是否需要spc分析，1 yes;0 no")

ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesHisExcel.java

@@ -39,8 +39,6 @@ public class ProductFeaturesHisExcel {
     private Float sl;
     @Excel(name = "检验参数  规格上线")
     private Float usl;
-    @Excel(name = "工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
     @Excel(name = "是否需要spc分析，1 yes;0 no")
     private Integer isSpc;
     @Excel(name = "分析图形，关联control_graph表id")

ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java

@@ -20,7 +20,7 @@ public class ProductTypeExcel {
     @Excel(name = "产品类型 编码")
     private String code;
     @Excel(name = "描述")
-    private String desc;
+    private String descs;
     @Excel(name = "1 可用，0 不可用")
     private Integer status;
     @Excel(name = "备注")

ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java

@@ -20,9 +20,25 @@ public class ProductWorkingprocedureRelationExcel {
     @Excel(name = "工序id,关联 working_procedure 表")
     private Long workingProcedureId;
     @Excel(name = "顺序，工序是有先后顺序的。")
-    private Integer order;
+    private Integer sequence;
     @Excel(name = "1 可用，0 不可用")
     private Integer status;
+    @Excel(name = "node.shape")
+    private String shape;
+    @Excel(name = "node.x")
+    private Integer x;
+    @Excel(name = "node.y")
+    private Integer y;
+    @Excel(name = "node.width")
+    private Integer width;
+    @Excel(name = "node.width")
+    private Integer height;
+    @Excel(name = "node.lable")
+    private String lable;
+    @Excel(name = "字体颜色")
+    private String fontcolor;
+    @Excel(name = "背景颜色")
+    private String backcolor;
     @Excel(name = "备注")
     private String remark;
     @Excel(name = "删除标志，是否有效:1 可用 0不可用")

ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java

@@ -13,33 +13,33 @@ import java.time.LocalDateTime;
  */
 @Data
 public class UnitExcel {
-    @Excel(name = "ID")
-    private Long id;
+//    @Excel(name = "ID")
+//    private Long id;
     @Excel(name = "单位 名")
     private String name;
     @Excel(name = "单位 编码")
     private String code;
-    @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;
+//    @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-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java

@@ -13,31 +13,31 @@ import java.time.LocalDateTime;
  */
 @Data
 public class WorkingProcedureTypeExcel {
-    @Excel(name = "ID")
-    private Long id;
+//    @Excel(name = "ID")
+//    private Long id;
     @Excel(name = "工序类型 名")
     private String name;
     @Excel(name = "工序类型 编码")
     private String code;
-    @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;
+//    @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-baisc/src/main/java/com/cnbm/basic/mapper/FactoryMapper.java

@@ -1,9 +1,12 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Factory;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 工厂 表
  *
@@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FactoryMapper extends BaseDao<Factory> {
-	
+
+    List<FactoryDTO> list();
 }

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

@@ -0,0 +1,21 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.basic.dto.ProductFeaturesDTO;
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.FeaturesStageProcedureRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since 2022-09-01
+ */
+@Mapper
+public interface FeaturesStageProcedureRelationMapper extends BaseDao<FeaturesStageProcedureRelation> {
+
+    void deleteByStageProcedure(Map<String, Object> params);
+}

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

@@ -3,13 +3,13 @@ package com.cnbm.basic.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.basic.dto.MachineDTO;
-import com.cnbm.basic.vo.MachineVo;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Machine;
 import com.cnbm.common.page.PageData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,5 +20,7 @@ import java.util.Map;
  */
 @Mapper
 public interface MachineMapper extends BaseDao<Machine> {
-	PageData<MachineVo> page(Page<?> page, @Param("param") Map<String, Object> params);
+	PageData<MachineDTO> page(Map<String, Object> params);
+
+	List<MachineDTO> list(Map<String, Object> params);
 }

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

@@ -1,9 +1,12 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.MeasureToolDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.MeasureTool;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 量具表
  *
@@ -12,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MeasureToolMapper extends BaseDao<MeasureTool> {
-	
+	List<MeasureToolDTO> list();
 }

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

@@ -1,9 +1,13 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.FactoryDTO;
+import com.cnbm.basic.dto.PlatformDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Platform;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 站点表
  *
@@ -12,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PlatformMapper extends BaseDao<Platform> {
-	
+    List<PlatformDTO> list();
 }

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

@@ -4,6 +4,8 @@ import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.ProductFactoryRelation;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 产品-工厂 关系表
  *
@@ -12,5 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProductFactoryRelationMapper extends BaseDao<ProductFactoryRelation> {
-	
+	List<Long> getFactoryListByProductId(Long productId);
 }

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

@@ -1,9 +1,15 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.FeaturesProcedureDTO;
+import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
+import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.ProductFeatures;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 产品特性 表
  *
@@ -12,5 +18,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProductFeaturesMapper extends BaseDao<ProductFeatures> {
-	
+	List<ProductFeaturesDTO> getProductFeaturesByProductId(Long id);
+
+	List<FeaturesProcedureDTO> getFeaturesByStageProcedure(Map<String, Object> params);
+
+	List<ProductFeaturesDTO> getFeaturesList(Map<String, Object> params);
+
+	String getControlGraphNameById(Long id);
+
+	List<ProductFeaturesDTO> list();
+
+	List<ProductFeaturesDTO> getProductFeaturesByType(Integer type);
 }

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/ProductTypeMapper.java

@@ -1,12 +1,14 @@
 package com.cnbm.basic.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.ProductType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,4 +20,5 @@ import java.util.Map;
 @Mapper
 public interface ProductTypeMapper extends BaseDao<ProductType> {
     //IPage<ProductTypeDTO> page(IPage<ProductType> objectPage, @Param("param") Map<String, Object> params);
+    List<ProductTypeDTO> list();
 }

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

@@ -1,9 +1,12 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.ProductWorkingprocedureRelationDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.ProductWorkingprocedureRelation;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 工序 表
  *
@@ -12,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProductWorkingprocedureRelationMapper extends BaseDao<ProductWorkingprocedureRelation> {
-	
+    List<ProductWorkingprocedureRelationDTO> getWorkingprocedureByProductId(Long productId);
 }

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;
+
 /**
  * 班次 表
  *
@@ -12,5 +15,6 @@ 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;
+
 /**
  * 班组 表
  *
@@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TeamMapper extends BaseDao<Team> {
-	
+
+    List<TeamDTO> list();
 }

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

@@ -1,9 +1,13 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.FactoryDTO;
+import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Unit;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 单位 表
  *
@@ -12,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UnitMapper extends BaseDao<Unit> {
-	
+    List<UnitDTO> list();
 }

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

@@ -6,6 +6,7 @@ import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.WorkingProcedure;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,6 @@ import java.util.Map;
  */
 @Mapper
 public interface WorkingProcedureMapper extends BaseDao<WorkingProcedure> {
-    IPage<WorkingProcedureDTO> page(Map<String, Object> params);
+    //IPage<WorkingProcedureDTO> page(Map<String, Object> params);
+    List<WorkingProcedureDTO> list();
 }

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

@@ -1,9 +1,13 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.WorkingProcedureDTO;
+import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.WorkingProcedureType;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 工序类型表 表
  *
@@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface WorkingProcedureTypeMapper extends BaseDao<WorkingProcedureType> {
-	
+
+    List<WorkingProcedureTypeDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mysql/Factorymysql.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 (1561977619142254594, 1067246875800000035, '工厂 表', 'basic/factory', 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 (1561977619142254595, 1561977619142254594, '查看', NULL, 'basic:factory:page,basic:factory: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 (1561977619142254596, 1561977619142254594, '新增', NULL, 'basic:factory: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 (1561977619142254597, 1561977619142254594, '修改', NULL, 'basic:factory: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 (1561977619142254598, 1561977619142254594, '删除', NULL, 'basic:factory: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 (1561977619142254599, 1561977619142254594, '导出', NULL, 'basic:factory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/FeaturesStageProcedureRelationmysql.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 (1565241134464434177, 1067246875800000035, '过程检验-工艺-检验参数 关系表 ', 'basic/featuresStageProcedureRelation', 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 (1565241134464434178, 1565241134464434177, '查看', NULL, 'basic:featuresStageProcedureRelation:page,basic:featuresStageProcedureRelation: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 (1565241134464434179, 1565241134464434177, '新增', NULL, 'basic:featuresStageProcedureRelation: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 (1565241134464434180, 1565241134464434177, '修改', NULL, 'basic:featuresStageProcedureRelation: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 (1565241134464434181, 1565241134464434177, '删除', NULL, 'basic:featuresStageProcedureRelation: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 (1565241134464434182, 1565241134464434177, '导出', NULL, 'basic:featuresStageProcedureRelation:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Machinemysql.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 (1561978239198765057, 1067246875800000035, '机台表', 'basic/machine', 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 (1561978239198765058, 1561978239198765057, '查看', NULL, 'basic:machine:page,basic:machine: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 (1561978239198765059, 1561978239198765057, '新增', NULL, 'basic:machine: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 (1561978239198765060, 1561978239198765057, '修改', NULL, 'basic:machine: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 (1561978239198765061, 1561978239198765057, '删除', NULL, 'basic:machine: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 (1561978239198765062, 1561978239198765057, '导出', NULL, 'basic:machine:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/MeasureToolmysql.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 (1561978986309140482, 1067246875800000035, '量具表', 'basic/measureTool', 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 (1561978986309140483, 1561978986309140482, '查看', NULL, 'basic:measureTool:page,basic:measureTool: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 (1561978986309140484, 1561978986309140482, '新增', NULL, 'basic:measureTool: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 (1561978986309140485, 1561978986309140482, '修改', NULL, 'basic:measureTool: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 (1561978986309140486, 1561978986309140482, '删除', NULL, 'basic:measureTool: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 (1561978986309140487, 1561978986309140482, '导出', NULL, 'basic:measureTool:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Platformmysql.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 (1561978141555367938, 1067246875800000035, '站点表', 'basic/platform', 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 (1561978141555367939, 1561978141555367938, '查看', NULL, 'basic:platform:page,basic:platform: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 (1561978141555367940, 1561978141555367938, '新增', NULL, 'basic:platform: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 (1561978141555367941, 1561978141555367938, '修改', NULL, 'basic:platform: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 (1561978141555367942, 1561978141555367938, '删除', NULL, 'basic:platform: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 (1561978141555367943, 1561978141555367938, '导出', NULL, 'basic:platform:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductFactoryRelationmysql.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 (1561977729704062978, 1067246875800000035, '产品-工厂 关系表', 'basic/productFactoryRelation', 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 (1561977729704062979, 1561977729704062978, '查看', NULL, 'basic:productFactoryRelation:page,basic:productFactoryRelation: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 (1561977729704062980, 1561977729704062978, '新增', NULL, 'basic:productFactoryRelation: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 (1561977729704062981, 1561977729704062978, '修改', NULL, 'basic:productFactoryRelation: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 (1561977729704062982, 1561977729704062978, '删除', NULL, 'basic:productFactoryRelation: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 (1561977729704062983, 1561977729704062978, '导出', NULL, 'basic:productFactoryRelation:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductFeaturesHismysql.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 (1561978894416162817, 1067246875800000035, '产品特性 历史表', 'basic/productFeaturesHis', 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 (1561978894416162818, 1561978894416162817, '查看', NULL, 'basic:productFeaturesHis:page,basic:productFeaturesHis: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 (1561978894416162819, 1561978894416162817, '新增', NULL, 'basic:productFeaturesHis: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 (1561978894416162820, 1561978894416162817, '修改', NULL, 'basic:productFeaturesHis: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 (1561978894416162821, 1561978894416162817, '删除', NULL, 'basic:productFeaturesHis: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 (1561978894416162822, 1561978894416162817, '导出', NULL, 'basic:productFeaturesHis:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductFeaturesmysql.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 (1561978720398680066, 1067246875800000035, '产品特性 表', 'basic/productFeatures', 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 (1561978720398680067, 1561978720398680066, '查看', NULL, 'basic:productFeatures:page,basic:productFeatures: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 (1561978720398680068, 1561978720398680066, '新增', NULL, 'basic:productFeatures: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 (1561978720398680069, 1561978720398680066, '修改', NULL, 'basic:productFeatures: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 (1561978720398680070, 1561978720398680066, '删除', NULL, 'basic:productFeatures: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 (1561978720398680071, 1561978720398680066, '导出', NULL, 'basic:productFeatures:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductTypemysql.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 (1561975128501645313, 1067246875800000035, '产品类型 表', 'basic/productType', 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 (1561975128501645314, 1561975128501645313, '查看', NULL, 'basic:productType:page,basic:productType: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 (1561975128501645315, 1561975128501645313, '新增', NULL, 'basic:productType: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 (1561975128501645316, 1561975128501645313, '修改', NULL, 'basic:productType: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 (1561975128501645317, 1561975128501645313, '删除', NULL, 'basic:productType: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 (1561975128501645318, 1561975128501645313, '导出', NULL, 'basic:productType:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductWorkingprocedureRelationmysql.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 (1561978609518055426, 1067246875800000035, '产品-工序 关系表', 'basic/productWorkingprocedureRelation', 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 (1561978609518055427, 1561978609518055426, '查看', NULL, 'basic:productWorkingprocedureRelation:page,basic:productWorkingprocedureRelation: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 (1561978609518055428, 1561978609518055426, '新增', NULL, 'basic:productWorkingprocedureRelation: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 (1561978609518055429, 1561978609518055426, '修改', NULL, 'basic:productWorkingprocedureRelation: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 (1561978609518055430, 1561978609518055426, '删除', NULL, 'basic:productWorkingprocedureRelation: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 (1561978609518055431, 1561978609518055426, '导出', NULL, 'basic:productWorkingprocedureRelation:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Productmysql.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 (1561977860146929666, 1067246875800000035, '产品 表', 'basic/product', 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 (1561977860146929667, 1561977860146929666, '查看', NULL, 'basic:product:page,basic:product: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 (1561977860146929668, 1561977860146929666, '新增', NULL, 'basic:product: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 (1561977860146929669, 1561977860146929666, '修改', NULL, 'basic:product: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 (1561977860146929670, 1561977860146929666, '删除', NULL, 'basic:product: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 (1561977860146929671, 1561977860146929666, '导出', NULL, 'basic:product:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Shiftmysql.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 (1561977446785724417, 1067246875800000035, '班次 表', 'basic/shift', 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 (1561977446785724418, 1561977446785724417, '查看', NULL, 'basic:shift:page,basic:shift: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 (1561977446785724419, 1561977446785724417, '新增', NULL, 'basic:shift: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 (1561977446785724420, 1561977446785724417, '修改', NULL, 'basic:shift: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 (1561977446785724421, 1561977446785724417, '删除', NULL, 'basic:shift: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 (1561977446785724422, 1561977446785724417, '导出', NULL, 'basic:shift:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Teammysql.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 (1561977547536990209, 1067246875800000035, '班组 表', 'basic/team', 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 (1561977547536990210, 1561977547536990209, '查看', NULL, 'basic:team:page,basic:team: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 (1561977547536990211, 1561977547536990209, '新增', NULL, 'basic:team: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 (1561977547536990212, 1561977547536990209, '修改', NULL, 'basic:team: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 (1561977547536990213, 1561977547536990209, '删除', NULL, 'basic:team: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 (1561977547536990214, 1561977547536990209, '导出', NULL, 'basic:team:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Unitmysql.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 (1561976675012771841, 1067246875800000035, '单位 表', 'basic/unit', 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 (1561976675012771842, 1561976675012771841, '查看', NULL, 'basic:unit:page,basic:unit: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 (1561976675012771843, 1561976675012771841, '新增', NULL, 'basic:unit: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 (1561976675012771844, 1561976675012771841, '修改', NULL, 'basic:unit: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 (1561976675012771845, 1561976675012771841, '删除', NULL, 'basic:unit: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 (1561976675012771846, 1561976675012771841, '导出', NULL, 'basic:unit:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/WorkingProcedureTypemysql.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 (1561978394501234689, 1067246875800000035, '工序类型表 表', 'basic/workingProcedureType', 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 (1561978394501234690, 1561978394501234689, '查看', NULL, 'basic:workingProcedureType:page,basic:workingProcedureType: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 (1561978394501234691, 1561978394501234689, '新增', NULL, 'basic:workingProcedureType: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 (1561978394501234692, 1561978394501234689, '修改', NULL, 'basic:workingProcedureType: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 (1561978394501234693, 1561978394501234689, '删除', NULL, 'basic:workingProcedureType: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 (1561978394501234694, 1561978394501234689, '导出', NULL, 'basic:workingProcedureType:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/WorkingProceduremysql.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 (1561978465661812738, 1067246875800000035, '工序 表', 'basic/workingProcedure', 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 (1561978465661812739, 1561978465661812738, '查看', NULL, 'basic:workingProcedure:page,basic:workingProcedure: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 (1561978465661812740, 1561978465661812738, '新增', NULL, 'basic:workingProcedure: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 (1561978465661812741, 1561978465661812738, '修改', NULL, 'basic:workingProcedure: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 (1561978465661812742, 1561978465661812738, '删除', NULL, 'basic:workingProcedure: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 (1561978465661812743, 1561978465661812738, '导出', NULL, 'basic:workingProcedure:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.basic.entity.Factory;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,5 +25,7 @@ public interface IFactoryService extends CrudService<Factory, FactoryDTO> {
 
     void delete(Long[] ids);
 
+    List<FactoryDTO> list();
+
     boolean changeStatus(Long id);
 }

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

@@ -0,0 +1,31 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
+import com.cnbm.basic.entity.FeaturesStageProcedureRelation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since  2022-09-01
+ */
+public interface IFeaturesStageProcedureRelationService extends CrudService<FeaturesStageProcedureRelation, FeaturesStageProcedureRelationDTO> {
+    PageData<FeaturesStageProcedureRelationDTO> page (Map<String, Object> params);
+
+    FeaturesStageProcedureRelationDTO get(Long id);
+
+    void save(FeaturesStageProcedureRelationDTO dto);
+
+    void update(FeaturesStageProcedureRelationDTO dto);
+
+    void delete(Long[] ids);
+
+    void batchInsert(FeaturesStageProcedureRelationDTO[] lists);
+
+    void deleteByStageProcedure(Map<String, Object> params);
+}

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

@@ -1,11 +1,11 @@
 package com.cnbm.basic.service;
 
-import com.cnbm.basic.vo.MachineVo;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.MachineDTO;
 import com.cnbm.basic.entity.Machine;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,7 +17,7 @@ import java.util.Map;
 public interface IMachineService extends CrudService<Machine, MachineDTO> {
     PageData<MachineDTO> page (Map<String, Object> params);
 
-    PageData<MachineVo> page1 (Map<String, Object> params);
+    PageData<MachineDTO> page1 (Map<String, Object> params);
 
     MachineDTO get(Long id);
 
@@ -27,5 +27,7 @@ public interface IMachineService extends CrudService<Machine, MachineDTO> {
 
     void delete(Long[] ids);
 
+    List<MachineDTO> list(Map<String, Object> params);
+
     boolean changeStatus(Long id);
 }

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

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.MeasureToolDTO;
 import com.cnbm.basic.entity.MeasureTool;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,4 +26,6 @@ public interface IMeasureToolService extends CrudService<MeasureTool, MeasureToo
     void delete(Long[] ids);
 
     boolean changeStatus(Long id);
+
+    List<MeasureToolDTO> list();
 }