docs 📝 readme中补充多数据源配置指南

.drone.yml

@@ -11,16 +11,16 @@ steps:
   - name: dockerconfig
     path: /root/.docker
   commands:
-  - docker build -t harbor.picaiba.com/kszny/mes-api:1.0.0-cigs4 ./ && docker push harbor.picaiba.com/kszny/mes-api:1.0.0-cigs4
+  - docker build -t harbor.picaiba.com/kszny/mes-api:1.0.0-india ./ && docker push harbor.picaiba.com/kszny/mes-api:1.0.0-india
 
 - name: deploy
   image: harbor.picaiba.com/tools/kubectl
   commands:
   - echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts
   - sleep 1
-  - kubectl scale --replicas=0 deployment/mes-api -n mes-cigs4
+  - kubectl scale --replicas=0 deployment/mes-api -n mes-india
   - sleep 3
-  - kubectl scale --replicas=1 deployment/mes-api -n mes-cigs4
+  - kubectl scale --replicas=1 deployment/mes-api -n mes-india
   depends_on:
   - build
 
@@ -34,6 +34,6 @@ volumes:
     
 trigger:
   branch:
-  - master
+  - porject/yd-monitor
   event:
   - push

Dockerfile

@@ -49,7 +49,7 @@ ENV TZ="Asia/Shanghai"
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # 定义一些环境变量，方便环境变量传参
 ENV JVM_OPTS=""
-ENV JAVA_OPTS=""
+ENV JAVA_OPTS="-Dspring.profiles.active=dev"
 # 指定暴露的端口，起到说明的作用，不指定也会暴露对应端口
 EXPOSE 8080
 # 启动 jar 的命令

README.md

@@ -27,3 +27,40 @@
 - MySQL8.0
 - redis6.0+
 <br>
+
+## 多数据源配置指南
+1. 在你需要用到多数据源的项目/模块中引入多数据源jar包的maven依赖
+```xml
+<dependency>
+    <groupId>com.cnbm</groupId>
+    <artifactId>ym-dynamic-datasource</artifactId>
+    <version>1.0-SNAPSHOT</version>
+</dependency>
+```
+
+2. 配置文件中，配置多数据源，注意必须以`dynamic.datasource`作为前缀，如下（slave1,slave2可以自己随意命名，数据源不限于2个）：
+```yml
+dynamic:
+  datasource:
+    slave1:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://localhost:3306/mysql?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      username: xxx
+      password: xxx
+    slave2:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://localhost:3306/myysql?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      username: xxx
+      password: xxx
+```
+
+3. 在service实现中，需要指定数据源的方法上面添加注解，比如，在login这个方法调用时，指定用`slave1`这个数据源
+```java
+@DataSource("slave1")
+public Result login(HttpServletRequest request, LoginParam loginParam) {
+        ......
+}
+```
+
+4. 验证
+可以在日志中看到类似输出：`set datasource is slave1`

ym-admin/db/ChangePackagingBoxHistorymysql.sql

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1626059890161434625, 1067246875800000035, '包装箱拆合箱历史表', 'packing/changePackagingBoxHistory', 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 (1626059890161434626, 1626059890161434625, '查看', NULL, 'packing:changePackagingBoxHistory:page,packing:changePackagingBoxHistory: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 (1626059890161434627, 1626059890161434625, '新增', NULL, 'packing:changePackagingBoxHistory: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 (1626059890161434628, 1626059890161434625, '修改', NULL, 'packing:changePackagingBoxHistory: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 (1626059890161434629, 1626059890161434625, '删除', NULL, 'packing:changePackagingBoxHistory: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 (1626059890161434630, 1626059890161434625, '导出', NULL, 'packing:changePackagingBoxHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-admin/db/PrintModelmysql.sql

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627506543435272194, 1067246875800000035, '打印标签模板表', 'packing/printModel', 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 (1627506543435272195, 1627506543435272194, '查看', NULL, 'packing:printModel:page,packing:printModel: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 (1627506543435272196, 1627506543435272194, '新增', NULL, 'packing:printModel: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 (1627506543435272197, 1627506543435272194, '修改', NULL, 'packing:printModel: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 (1627506543435272198, 1627506543435272194, '删除', NULL, 'packing:printModel: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 (1627506543435272199, 1627506543435272194, '导出', NULL, 'packing:printModel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-admin/db/WoCompensationPowermysql.sql

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627488175458189314, 1067246875800000035, '基板补偿功率 表', 'packing/woCompensationPower', 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 (1627488175458189315, 1627488175458189314, '查看', NULL, 'packing:woCompensationPower:page,packing:woCompensationPower: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 (1627488175458189316, 1627488175458189314, '新增', NULL, 'packing:woCompensationPower: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 (1627488175458189317, 1627488175458189314, '修改', NULL, 'packing:woCompensationPower: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 (1627488175458189318, 1627488175458189314, '删除', NULL, 'packing:woCompensationPower: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 (1627488175458189319, 1627488175458189314, '导出', NULL, 'packing:woCompensationPower:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-admin/db/WoPackagingBoxSubstratemysql.sql

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627855073022648322, 1067246875800000035, '包装箱基板关联表 ( 基板表 )', 'packing/woPackagingBoxSubstrate', 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 (1627855073022648323, 1627855073022648322, '查看', NULL, 'packing:woPackagingBoxSubstrate:page,packing:woPackagingBoxSubstrate: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 (1627855073022648324, 1627855073022648322, '新增', NULL, 'packing:woPackagingBoxSubstrate: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 (1627855073022648325, 1627855073022648322, '修改', NULL, 'packing:woPackagingBoxSubstrate: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 (1627855073022648326, 1627855073022648322, '删除', NULL, 'packing:woPackagingBoxSubstrate: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 (1627855073022648327, 1627855073022648322, '导出', NULL, 'packing:woPackagingBoxSubstrate:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-admin/db/WoPackagingBoxmysql.sql

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628230581925277697, 1067246875800000035, '包装箱表', 'code/woPackagingBox', 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 (1628230581925277698, 1628230581925277697, '查看', NULL, 'code:woPackagingBox:page,code:woPackagingBox: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 (1628230581925277699, 1628230581925277697, '新增', NULL, 'code:woPackagingBox: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 (1628230581925277700, 1628230581925277697, '修改', NULL, 'code:woPackagingBox: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 (1628230581925277701, 1628230581925277697, '删除', NULL, 'code:woPackagingBox: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 (1628230581925277702, 1628230581925277697, '导出', NULL, 'code:woPackagingBox:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-admin/db/WoPackagingPrintHistorymysql.sql

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627603723110080513, 1067246875800000035, '包装箱打印历史表', 'packing/woPackagingPrintHistory', 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 (1627603723110080514, 1627603723110080513, '查看', NULL, 'packing:woPackagingPrintHistory:page,packing:woPackagingPrintHistory: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 (1627603723110080515, 1627603723110080513, '新增', NULL, 'packing:woPackagingPrintHistory: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 (1627603723110080516, 1627603723110080513, '修改', NULL, 'packing:woPackagingPrintHistory: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 (1627603723110080517, 1627603723110080513, '删除', NULL, 'packing:woPackagingPrintHistory: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 (1627603723110080518, 1627603723110080513, '导出', NULL, 'packing:woPackagingPrintHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-admin/db/WoPowerLevelmysql.sql

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627486255993688065, 1067246875800000035, '功率等级 表', 'packing/woPowerLevel', 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 (1627486255993688066, 1627486255993688065, '查看', NULL, 'packing:woPowerLevel:page,packing:woPowerLevel: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 (1627486255993688067, 1627486255993688065, '新增', NULL, 'packing:woPowerLevel: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 (1627486255993688068, 1627486255993688065, '修改', NULL, 'packing:woPowerLevel: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 (1627486255993688069, 1627486255993688065, '删除', NULL, 'packing:woPowerLevel: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 (1627486255993688070, 1627486255993688065, '导出', NULL, 'packing:woPowerLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-admin/pom.xml

@@ -43,11 +43,6 @@
             <artifactId>ym-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.75</version>
-        </dependency>
 
     </dependencies>
 

ym-admin/src/main/java/com/cnbm/admin/base/BaseSupport.java

@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2018.
- * http://www.ulabcare.com
- */
-
-package com.cnbm.admin.base;
-
-import com.alibaba.fastjson.JSON;
-import com.cnbm.admin.entity.LoginUser;
-import com.cnbm.admin.enums.WhetherEnum;
-import lombok.Builder;
-import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 接口支持基类
- *
- * @author jiff
- * @date 2018/11/1
- * @since 1.0
- */
-@Service
-public class BaseSupport {
-
-    protected LoginUser getLoginUser() {
-        // 后续完善拦截器再使用该方式
-//        LoginUser loginUser = loginUserHolder.get();
-//        if (loginUser != null) {
-//            return loginUser;
-//        }
-        HttpSession session = getHttpServletRequest().getSession(false);
-        LoginUser loginUser = null;
-        if (session != null) {
-            String loginUserJson = (String) session.getAttribute(LoginUser.HTTP_HEADER_NAME);
-            if (StringUtils.isNotBlank(loginUserJson)) {
-                loginUser = JSON.parseObject(loginUserJson, LoginUser.class);
-                return loginUser;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 获取当前http请求对象
-     *
-     * @return
-     */
-    protected HttpServletRequest getHttpServletRequest() {
-        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-    }
-
-    /**
-     * 获取当前http响应对象
-     *
-     * @return
-     */
-    protected HttpServletResponse getHttpServletResponse() {
-        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
-    }
-
-
-    /**
-     * 设置公共字段值，一般用于创建新记录，包含以下字段：
-     *
-     * <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 <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().getSysUserEntity().getId())
-                .creatorName(getLoginUser().getUsername())
-                .updateTime(LocalDateTime.now())
-                .updaterId(getLoginUser().getSysUserEntity().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 <T extends Serializable> T setUpdateCommonField(T t) {
-        CommonField commonField = CommonField.builder()
-                .updaterId(getLoginUser().getSysUserEntity().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/java/com/cnbm/admin/config/SecurityConfig.java

@@ -72,8 +72,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/swagger-ui/**",
                         "/webjars/**",
                         "/websocket/**",
-                        "/test/**",
-                        "/**/expert",
                         "/captcha",
                         "druid/**").anonymous()
 //                .antMatchers("/testCors").hasAuthority("system:dept:list222")

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

@@ -24,8 +24,6 @@ public class LoginUser implements UserDetails{
 
     private static final long serialVersionUID = 1L;
 
-    public static final String HTTP_HEADER_NAME = "loginUser";
-
     private SysUserEntity sysUserEntity;
 
     private List<String> permissions;

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

@@ -1,6 +1,5 @@
 package com.cnbm.admin.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.cnbm.admin.entity.LoginUser;
 import com.cnbm.admin.entity.SysLogLoginEntity;
 import com.cnbm.admin.enums.LoginOperationEnum;
@@ -10,6 +9,7 @@ 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;
@@ -22,11 +22,8 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -56,10 +53,10 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public Result login(HttpServletRequest request, LoginParam loginParam) {
         //验证码是否正确
-//        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
+        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
-//        if(!flag){
+        if(!flag){
-//            return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
+            return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
-//        }
+        }
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword());
         Authentication authenticate = authenticationManager.authenticate(authenticationToken);
         //登录日志
@@ -84,11 +81,6 @@ public class LoginServiceImpl implements LoginService {
         map.put("token",jwt);
         //把完整的用户信息存入redis  userid作为key
         redisTemplate.opsForValue().set("login:"+userid,loginUser,1, TimeUnit.DAYS);
-
-        //当前登录用户信息存入session中
-        HttpSession session = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest().getSession();
-        session.setAttribute(loginUser.HTTP_HEADER_NAME, JSON.toJSONString(loginUser));
-
         //登录成功
         log.setStatus(LoginStatusEnum.SUCCESS.value());
         log.setCreator(loginUser.getSysUserEntity().getId());

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

@@ -58,7 +58,7 @@ public abstract class BaseSupportUtils {
      */
     public static <T extends Serializable> T setCommonField(T t, String... ignoreProperties) {
         CommonField commonField = CommonField.builder()
-//                .enabled(WhetherEnum.YES.getValue())
+                .enabled(WhetherEnum.YES.getValue())
                 .valid(WhetherEnum.YES.getValue())
                 .createTime(LocalDateTime.now())
                 .creatorId(getLoginUser().getId())
@@ -89,7 +89,7 @@ public abstract class BaseSupportUtils {
                 .updaterName(getLoginUser().getUsername())
                 .updateTime(LocalDateTime.now())
                 .build();
-        BeanUtils.copyProperties(commonField, t,  "valid");
+        BeanUtils.copyProperties(commonField, t, "enabled", "valid");
         return t;
     }
 

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

@@ -1,683 +0,0 @@
-/*
- * Copyright (c) 2019.
- * http://www.ulabcare.com
- */
-
-package com.cnbm.admin.utils;
-
-/**
- * <p>
- * 编号生成帮助类
- * 以2+8+6形式生成（2位编号类型前缀+8位年月日+6位自增序列号 ）
- * 2位编号类型前缀定义如下⤵
- * 1x：患者相关编号以 '1' 开头，(病例号:10 )
- * 2x：订单相关编号以 '2' 开头，如订单编号=20
- * 3x: 支付相关编号以 '3' 开头，如系统内部支付订单号=30
- * (未完待续...)
- * </P>
- *
- * @author FanYi
- * @date 2019-01-03
- * @since 1.0
- */
-public class CodeGeneratorHelper {
-
-    /**
-     * 订单编号
-     */
-    public static final String ORDER_CODE = "ORDER_CODE";
-    /**
-     * 工艺编号
-     */
-    public static final String PROCESS_FLOW_CODE = "PROCESS_FLOW_CODE";
-
-    /**
-     * 工艺设备点编号
-     */
-    public static final String PROCESS_FLOW_EQUIPMENT_CODE = "PROCESS_FLOW_EQUIPMENT_CODE";
-    /**
-     * BOM编号
-     */
-    public static final String BOM_CODE = "BOM_CODE";
-    /**
-     * 基板编号
-     */
-    public static final String SUBSTRATESU_CODE = "SUBSTRATESU_CODE";
-
-    /**
-     * 报警等级编号
-     */
-    public static final String ALARM_GRADE_CODE = "ALARM_GRADE_CODE";
-
-    /**
-     * 物料信息编号
-     */
-    public static final String MATERIAL_CODE = "MATERIAL_CODE";
-
-    /**
-     * 物料信息编号
-     */
-    public static final String EQUIPMENT_MATERIAL_BOM_CODE = "EQUIPMENT_MATERIAL_BOM_CODE";
-
-    /**
-     * 区域编号
-     */
-    public static final String AREA_CODE = "AREA_CODE";
-
-    /**
-     * 缓存区编号
-     */
-    public static final String CACHE_CODE = "CACHE_CODE";
-
-    /**
-     * 设备报警编号
-     */
-    public static final String EQUIPMENT_ALARM_CODE = "EQUIPMENT_ALARM_CODE";
-
-    /**
-     * 设备保养计划单号
-     */
-    public static final String EQUIPMENT_MAINTENANCE_PLAN_CODE = "EQUIPMENT_MAINTENANCE_PLAN_CODE";
-
-    /**
-     * 设备保养记录单号
-     */
-    public static final String EQUIPMENT_MAINTENANCE_LOG_CODE = "EQUIPMENT_MAINTENANCE_LOG_CODE";
-
-
-    /**
-     * 设备类型编号
-     */
-    public static final String EQUIPMENT_TYPE_CODE = "EQUIPMENT_TYPE_CODE";
-
-    /**
-     * 保养周期编号
-     */
-    public static final String MAINTENANCE_PERIOD_CODE = "MAINTENANCE_PERIOD_CODE";
-
-    /**
-     * 维修类型编号
-     */
-    public static final String MAINTENANCE_TYPE_CODE = "MAINTENANCE_TYPE_CODE";
-
-    /**
-     * 物料类型编号
-     */
-    public static final String MATERIAL_TYPE_CODE = "MATERIAL_TYPE_CODE";
-
-    /**
-     * 设备参数编号 编号
-     */
-    public static final String EQUIPMENT_PARAMETER_CODE = "EQUIPMENT_PARAMETER_CODE";
-
-    /**
-     * 设备编号
-     */
-    public static final String EQUIPMENT_CODE = "EQUIPMENT_CODE";
-
-    /**
-     * 库位编号
-     */
-    public static final String STOCK_CODE = "STOCK_CODE";
-
-    /**
-     * 库位位置编号
-     */
-    public static final String STOCK_POSITION_CODE = "STOCK_POSITION_CODE";
-
-    /**
-     * 货架编号
-     */
-    public static final String SHELF_CODE = "SHELF_CODE";
-
-    /**
-     * 废品报废编号
-     */
-    public static final String SCRAP_CODE = "SCRAP_CODE";
-
-    /**
-     * 连线设备编号
-     */
-    public static final String CONNECTING_DEVICE_CODE = "CONNECTING_DEVICE_CODE";
-
-    /**
-     * 报警类型编号
-     */
-    public static final String ALARM_TYPE_CODE = "ALARM_TYPE_CODE";
-
-    /**
-     * 报警信息编号
-     */
-    public static final String ALARM_CODE = "ALARM_CODE";
-
-    /**
-     * 物料批次编号
-     */
-    public static final String MATERIAL_DATE_CODE = "MATERIAL_DATE_CODE";
-
-    /**
-     * 储存箱编号
-     */
-    public static final String STORAGE_BOX_CODE = "STORAGE_BOX_CODE";
-    /**
-     * 工序编号
-     */
-    public static final String SEQUENCE_CODE = "SEQUENCE_CODE";
-
-    private static final String DETECT_EQUIPMENT_SYSTEM_CODE = "DETECT_EQUIPMENT_SYSTEM_CODE";
-
-    /**
-     * 标签编码
-     */
-    public static final String PRINT_MODEL_CODE = "PRINT_MODEL";
-
-    /**
-     * 生成物料批次编号
-     *
-     * @return 物料批次编号
-     */
-    public static String getMaterialDateCode() {
-        return IDGenerator.gen("PC", "yyyyMMdd", 6, MATERIAL_DATE_CODE);
-    }
-    /**
-     * 连线设备属性编号
-     */
-    public static final String CONNECTING_DEVICE_ATTR_CODE = "CONNECTING_DEVICE_ATTR_CODE";
-
-
-    /**
-     * 工厂编号
-     */
-    public static final String FACTORY_CODE = "FACTORY_CODE";
-
-    /**
-     * 产线编号
-     */
-    public static final String PRODUCTION_LINE_CODE = "PRODUCTION_LINE_CODE";
-
-    /**
-     * 设备类型报警明细编号
-     */
-    public static final String EQUIPMENT_TYPE_ALARM_CODE = "EQUIPMENT_TYPE_ALARM_CODE";
-
-
-    /**
-     * 工单编号
-     */
-    public static final String WORK_ORDER_CODE = "WORK_ORDER_CODE";
-
-    /**
-     * 报废类型编号
-     */
-    public static final String SCRAP_TYPE_INFORMATION_CODE = "SCRAP_TYPE_INFORMATION_CODE";
-
-    /**
-     * 报废原因编号
-     */
-    public static final String SCRAP_INFORMATION_CODE = "SCRAP_INFORMATION_CODE";
-
-    /**
-     * 报废原因编号
-     */
-    public static final String SUBSTRATE_BATCH_INFO_CODE = "SUBSTRATE_BATCH_INFO_CODE";
-
-    /**
-     * 检测下发区域编号
-     */
-    public static final String DETECT_DISTRIBUTION_AREA_CODE = "DETECT_DISTRIBUTION_AREA_CODE";
-
-    /**
-     * 离线检测参数编码
-     */
-    public static final String OFFLINE_DETECT_PARAM_CODE = "OFFLINE_DETECT_PARAM_CODE";
-
-    /**
-     * 设备配方CODE
-     */
-    public static final String EQUIPMENT_RECIPE_CODE = "EQUIPMENT_RECIPE_CODE";
-
-    /**
-     * 设备事件CODE
-     */
-    public static final String EQUIPMENT_EVENT_CODE = "EQUIPMENT_EVENT_CODE";
-
-    /**
-     * 设备分组CODE
-     */
-    public static final String EQUIPMENT_GROUP_CODE = "EQUIPMENT_GROUP_CODE";
-
-    /**
-     * power class CODE
-     */
-    public static final String POWER_CLASSIFICATION_CODE = "POWER_CLASSIFICATION_CODE";
-
-    /**
-     * power class CODE
-     */
-    public static final String EQUIPMENT_REPAIR_CODE = "EQUIPMENT_REPAIR_CODE";
-
-    /**
-     * 存储箱 CODE
-     */
-    public static final String STORAGE_TANK_CODE = "STORAGE_TANK_CODE";
-
-    /**
-     * 权限 CODE
-     */
-    public static final String ROLE_CODE = "STORAGE_TANK_CODE";
-    /**
-     * 权限CODE
-     *
-     * @return 权限CODE
-     */
-    public static String getRoleCode() {
-        return IDGenerator.gen("ROLE", "yyyyMMdd", 6, ROLE_CODE);
-    }
-
-    /**
-     * 存储箱CODE
-     *
-     * @return 存储箱CODE
-     */
-    public static String getStorageTankCode() {
-        return IDGenerator.gen("CCX", "yyyyMMdd", 6, STORAGE_TANK_CODE);
-    }
-
-    /**
-     * 生成工艺设备点CODE
-     *
-     * @return 工艺设备点CODE
-     */
-    public static String getEquipmentRepairCode() {
-        return IDGenerator.gen("SBWX", "yyyyMMdd", 6, EQUIPMENT_REPAIR_CODE);
-    }
-
-    /**
-     * 生成工艺设备点CODE
-     *
-     * @return 工艺设备点CODE
-     */
-    public static String getProcessFlowEquipmentGroupCode() {
-        return IDGenerator.gen("GYSBD", "yyyyMMdd", 6, PROCESS_FLOW_EQUIPMENT_CODE);
-    }
-
-    /**
-     * 生成设备分组CODE
-     *
-     * @return 设备分组CODE
-     */
-    public static String getEquipmentGroupCode() {
-        return IDGenerator.gen("SBFZ", "yyyyMMdd", 6, EQUIPMENT_GROUP_CODE);
-    }
-
-    /**
-     * 生成设备事件CODE
-     *
-     * @return 生成设备事件CODE
-     */
-    public static String getEquipmentEventCode() {
-        return IDGenerator.gen("SBSJ", "yyyyMMdd", 6, EQUIPMENT_EVENT_CODE);
-    }
-
-    /**
-     * 生成设备配方编码
-     *
-     * @return 生成设备配方编码
-     */
-    public static String getEquipmentRecipeCode() {
-        return IDGenerator.gen("SBPF", "yyyyMMdd", 6, EQUIPMENT_RECIPE_CODE);
-    }
-
-    /**
-     * 生成离线检测参数编码
-     *
-     * @return 生成离线检测参数编码
-     */
-    public static String getOfflineDetectParamCode() {
-        return IDGenerator.gen("LXCS", "yyyyMMdd", 6, OFFLINE_DETECT_PARAM_CODE);
-    }
-
-    /**
-     * 生成设备类型报警明细编号
-     *
-     * @return 设备类型报警明细编号
-     */
-    public static String getEquipmentTypeAlarmCode() {
-        return IDGenerator.gen("20", "yyyyMMdd", 6, EQUIPMENT_TYPE_ALARM_CODE);
-    }
-
-    /**
-     * 生成设备类型报警明细编号
-     *
-     * @return 设备类型报警明细编号
-     */
-    public static String getStorageBoxCode() {
-        return IDGenerator.gen("CCX", "yyyyMMdd", 6, STORAGE_BOX_CODE);
-    }
-
-
-
-    /**
-     * 生成订单编号
-     *
-     * @return 订单编号
-     */
-    public static String getOrderCode() {
-        return IDGenerator.gen("20", "yyyyMMdd", 6, ORDER_CODE);
-    }
-    /**
-     * 生成工艺编号
-     *
-     * @return 工艺编号
-     */
-    public static String getProcessFlowCode() {
-        return IDGenerator.gen("GY", "yyyyMMdd", 6, PROCESS_FLOW_CODE);
-    }
-    /**
-     * 生成基板编号
-     *
-     * @return 基板编号
-     */
-    public static String getSubstrateCode() {
-        return IDGenerator.gen("JB", "yyyyMMdd", 6, SUBSTRATESU_CODE);
-    }
-    /**
-     * 生成BOM编号
-     *
-     * @return BOM编号
-     */
-    public static String getBomCode() {
-        return IDGenerator.gen("BOM", "yyyyMMdd", 6, BOM_CODE);
-    }
-
-    /**
-     * 生成编号
-     *
-     * @return 编号
-     */
-    public static String getCode(String code) {
-        return IDGenerator.gen("20", "yyyyMMdd", 6, code);
-    }
-
-    /**
-     * 生成报警等级编号
-     *
-     * @return 编号
-     */
-    public static String getAlarmGradeCode() {
-        return IDGenerator.gen("BJDJ", "yyyyMMdd", 6, ALARM_GRADE_CODE);
-    }
-
-    /**
-     * 生成物料信息编号
-     *
-     * @return 编号
-     */
-    public static String getMaterialCode() {
-        return IDGenerator.gen("WLXX", "yyyyMMdd", 6, MATERIAL_CODE);
-    }
-
-    /**
-     * 生成设备物料Bom 编号
-     *
-     * @return 编号
-     */
-    public static String getEquipmentMaterialBomCode() {
-        return IDGenerator.gen("SBWLBOM", "yyyyMMdd", 6, EQUIPMENT_MATERIAL_BOM_CODE);
-    }
-
-    /**
-     * 生成设备参数 编号
-     *
-     * @return 编号
-     */
-    public static String getEquipmentParameterCode() {
-        return IDGenerator.gen("SBCS", "yyyyMMdd", 6, EQUIPMENT_PARAMETER_CODE);
-    }
-
-    /**
-     * 生成区域编号
-     *
-     * @return 编号
-     */
-    public static String getAreaCode() {
-        return IDGenerator.gen("QY", "yyyyMMdd", 6, AREA_CODE);
-    }
-
-    /**
-     * 生成缓存区编号
-     *
-     * @return 编号
-     */
-    public static String getCacheCode() {
-        return IDGenerator.gen("HCQ", "yyyyMMdd", 6, CACHE_CODE);
-    }
-
-    /**
-     * 生成设备报警编号
-     *
-     * @return 编号
-     */
-    public static String getEquipmentAlarmCode() {
-        return IDGenerator.gen("SBBJ", "yyyyMMdd", 6, EQUIPMENT_ALARM_CODE);
-    }
-
-    /**
-     * 生成设备保养计划编号
-     *
-     * @return 编号
-     */
-    public static String getEquipmentMaintenancePlanCode() {
-        return IDGenerator.gen("SBBYJH", "yyyyMMdd", 6, EQUIPMENT_MAINTENANCE_PLAN_CODE);
-    }
-
-    /**
-     * 生成设备保养记录编号
-     *
-     * @return 编号
-     */
-    public static String getEquipmentMaintenanceLogCode() {
-        return IDGenerator.gen("SBBYJL", "yyyyMMdd", 6, EQUIPMENT_MAINTENANCE_LOG_CODE);
-    }
-
-    /**
-     * 生成设备类型编号
-     *
-     * @return 编号
-     */
-    public static String getEquipmentTypeCode() {
-        return IDGenerator.gen("SBLX", "yyyyMMdd", 6, EQUIPMENT_TYPE_CODE);
-    }
-
-    /**
-     * 生成保养周期编号
-     *
-     * @return 编号
-     */
-    public static String getMaintenancePeriodCode() {
-        return IDGenerator.gen("BYZQ", "yyyyMMdd", 6, MAINTENANCE_PERIOD_CODE);
-    }
-
-    /**
-     * 生成维修类型编号
-     *
-     * @return 编号
-     */
-    public static String getMaintenanceTypeCode() {
-        return IDGenerator.gen("WXLX", "yyyyMMdd", 6, MAINTENANCE_TYPE_CODE);
-    }
-
-    /**
-     * 生成物料类型编号
-     *
-     * @return 编号
-     */
-    public static String getMaterialTypeCode() {
-        return IDGenerator.gen("WLLX", "yyyyMMdd", 6, MATERIAL_TYPE_CODE);
-    }
-
-    /**
-     * 生成设备编号
-     *
-     * @return 编号
-     */
-    public static String getEquipmentCode() {
-        return IDGenerator.gen("SB", "yyyyMMdd", 6, EQUIPMENT_CODE);
-    }
-
-    /**
-     * 生成库位位置编号
-     *
-     * @return 编号
-     */
-    public static String getStockPositionCode() {
-        return IDGenerator.gen("KWWZ", "yyyyMMdd", 6, STOCK_POSITION_CODE);
-    }
-
-    /**
-     * 生成库位编号
-     *
-     * @return 编号
-     */
-    public static String getStockCode() {
-        return IDGenerator.gen("KW", "yyyyMMdd", 6, STOCK_CODE);
-    }
-
-    /**
-     * 生成货架编号
-     *
-     * @return 编号
-     */
-    public static String getShelfCode() {
-        return IDGenerator.gen("HJ", "yyyyMMdd", 6, SHELF_CODE);
-    }
-
-    /**
-     * 生成废品报废编号
-     *
-     * @return 编号
-     */
-    public static String getScrapCode() {
-        return IDGenerator.gen("FPBF", "yyyyMMdd", 6, SCRAP_CODE);
-    }
-
-
-    /**
-     * 生成连线设备编号
-     *
-     * @return 编号
-     */
-    public static String getConnectingDeviceCode() {
-        return IDGenerator.gen("LXSB", "yyyyMMdd", 6, CONNECTING_DEVICE_CODE);
-    }
-
-    /**
-     * 生成报警类型编号
-     *
-     * @return 编号
-     */
-    public static String getAlarmTypeCode() {
-        return IDGenerator.gen("BJLX", "yyyyMMdd", 6, ALARM_TYPE_CODE);
-    }
-
-
-    /**
-     * 生成报警信息编号
-     *
-     * @return 编号
-     */
-    public static String getAlarmCode() {
-        return IDGenerator.gen("BJXX", "yyyyMMdd", 6, ALARM_CODE);
-    }
-
-    /**
-     * 生成连线设备属性编号
-     *
-     * @return 编号
-     */
-    public static String getConnectingDeviceAttrCode() {
-        return IDGenerator.gen("LXSBSX", "yyyyMMdd", 6, CONNECTING_DEVICE_ATTR_CODE);
-    }
-
-    /**
-     * 生成工厂编号
-     *
-     * @return 编号
-     */
-    public static String getFactoryCode() {
-        return IDGenerator.gen("GC", "yyyyMMdd", 6, FACTORY_CODE);
-    }
-
-
-    /**
-     * 生成产线编号
-     *
-     * @return 编号
-     */
-    public static String getProductionLineCode() {
-        return IDGenerator.gen("CX", "yyyyMMdd", 6, PRODUCTION_LINE_CODE);
-    }
-
-    /**
-     * 生成工单编号
-     *
-     * @return 编号
-     */
-    public static String getWorkOrderCode() {
-        return IDGenerator.gen("ZGD", "yyyyMMdd", 6, WORK_ORDER_CODE);
-    }
-
-    /**
-     * 生成报废类型编号
-     *
-     * @return 编号
-     */
-    public static String getScrapTypeInformationCode() {
-        return IDGenerator.gen("BFLX", "yyyyMMdd", 6, SCRAP_TYPE_INFORMATION_CODE);
-    }
-
-    /**
-     * 生成报废原因编号
-     *
-     * @return 编号
-     */
-    public static String getScrapInformationCode() {
-        return IDGenerator.gen("BFYY", "yyyyMMdd", 6, SCRAP_INFORMATION_CODE);
-    }
-
-
-    public static String getSubstrateBatchInfoCode() {
-        return IDGenerator.gen("PC", "yyyyMMdd", 6, SUBSTRATE_BATCH_INFO_CODE);
-    }
-    /**
-     * 生成工序编号
-     *
-     * @return
-     */
-    public static String getSequenceCode() {
-        return IDGenerator.gen("20", "yyyyMMdd", 6, SEQUENCE_CODE);
-    }
-
-
-    /**
-     * 生成检测下发区域编号
-     *
-     * @return
-     */
-    public static String getDetectDistributionAreaCode() {
-        return IDGenerator.gen("JCQY", "yyyyMMdd", 6, DETECT_DISTRIBUTION_AREA_CODE);
-    }
-
-
-    public static String getDetectEquipmentSystemCode() {
-        return IDGenerator.gen("LX", "yyyyMMdd", 6, DETECT_EQUIPMENT_SYSTEM_CODE);
-    }
-
-    public static String getPowerClassificationCode() {
-        return IDGenerator.gen("PC", "yyyyMMdd", 6, POWER_CLASSIFICATION_CODE);
-    }
-
-    public static String getPrintModelCode() {
-        return IDGenerator.gen("PM", "yyyyMMdd", 6, PRINT_MODEL_CODE);
-    }
-}

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

@@ -1,213 +0,0 @@
-package com.cnbm.admin.utils;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * id生成器，使用redis自增接口实现
- * TODO 待完善
- *
- * @author jiff
- * @date 2018-12-1
- * @since 1.0
- */
-@Component
-public class IDGenerator {
-    private RedisTemplate redisTemplate;
-    private static IDGenerator idGenerator;
-
-    /**
-     * 4位年格式
-     */
-    public static final String PATTERN_YYYY = "yyyy";
-    /**
-     * 6位年月格式
-     */
-    public static final String PATTERN_YYYYMM = "yyyyMM";
-    /**
-     * 8位年月日格式
-     */
-    public static final String PATTERN_YYYYMMDD = "yyyyMMdd";
-    /**
-     * 10位年月日时格式
-     */
-    public static final String PATTERN_YYYYMMDDHH = "yyyyMMddHH";
-    /**
-     * 12位年月日时分格式
-     */
-    public static final String PATTERN_YYYYMMDDHHMM = "yyyyMMddHHmm";
-
-
-    /**
-     * 最大序列号长度
-     */
-    private static final int MAX_SEQUENCE_LENGTH = 20;
-    /**
-     * 最大随机数长度
-     */
-    private static final int MAX_RANDOM_LENGTH = 10;
-    /**
-     * 序列命名空间
-     */
-    private static final String KEY_PREFIX_SEQUENCE = "SEQUENCE_";
-    private static final Map<String, SimpleDateFormat> commonDateFormats = new HashMap<>();
-    private static final List<DecimalFormat> sequenceFormats = new ArrayList<>();
-
-        static {
-            commonDateFormats.put(PATTERN_YYYY, new SimpleDateFormat(PATTERN_YYYY));
-            commonDateFormats.put(PATTERN_YYYYMM, new SimpleDateFormat(
-                    PATTERN_YYYYMM));
-        commonDateFormats.put(PATTERN_YYYYMMDD, new SimpleDateFormat(
-                PATTERN_YYYYMMDD));
-        commonDateFormats.put(PATTERN_YYYYMMDDHH, new SimpleDateFormat(
-                PATTERN_YYYYMMDDHH));
-        commonDateFormats.put(PATTERN_YYYYMMDDHHMM, new SimpleDateFormat(
-                PATTERN_YYYYMMDDHHMM));
-        StringBuilder sequencePattern = new StringBuilder(MAX_SEQUENCE_LENGTH);
-        for (int i = 0; i < MAX_SEQUENCE_LENGTH; i++) {
-                sequencePattern.append("0");
-                sequenceFormats.add(new DecimalFormat(sequencePattern.toString()));
-            }
-    }
-
-    @Autowired(required = false)
-    public void setRedisTemplate(RedisTemplate redisTemplate) {
-        RedisSerializer stringSerializer = new StringRedisSerializer();
-        //设置序列化Key的实例化对象
-        redisTemplate.setKeySerializer(stringSerializer);
-        //设置序列化Value的实例化对象
-        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
-        redisTemplate.setHashKeySerializer(stringSerializer);
-        redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
-        redisTemplate.setStringSerializer(stringSerializer);
-        redisTemplate.afterPropertiesSet();
-        this.redisTemplate = redisTemplate;
-    }
-
-    @PostConstruct
-    private void init() {
-        idGenerator = this;
-        idGenerator.redisTemplate = this.redisTemplate;
-    }
-
-    /**
-     * 生成主键
-     *
-     * @param sequenceName 序列名
-     * @return 主键
-     */
-    public static long gen(String sequenceName) {
-        return idGenerator.redisTemplate.opsForValue().increment(
-                KEY_PREFIX_SEQUENCE + sequenceName, 1);
-    }
-
-    /**
-     * 生成主键
-     *
-     * @param prefix         前缀，为空或null时则不使用前缀
-     * @param pattern        时间戳格式，为空或null时不使用时间戳，已定义5种格式：{@link #PATTERN_YYYY}、{@link #PATTERN_YYYYMM}、{@link #PATTERN_YYYYMMDD}、{@link #PATTERN_YYYYMMDDHH}、{@link #PATTERN_YYYYMMDDHHMM}、
-     * @param sequenceLength 序列长度，大于0时有效，否则使用序列原始值，最多{@value #MAX_SEQUENCE_LENGTH}位，超过{@value #MAX_SEQUENCE_LENGTH}默认为{@value #MAX_SEQUENCE_LENGTH}位
-     * @param sequenceName   序列名，为空或null时则不生成序列值
-     * @return prefix+timestamp+sequence
-     */
-    public static String gen(String prefix, String pattern, int sequenceLength,
-                             String sequenceName) {
-        return gen(prefix, pattern, sequenceLength, sequenceName, 0);
-    }
-
-    /**
-     * 生成主键
-     *
-     * @param prefix         前缀，为空或null时则不使用前缀
-     * @param pattern        时间戳格式，为空或null时不使用时间戳，已定义5种格式：{@link #PATTERN_YYYY}、{@link #PATTERN_YYYYMM}、{@link #PATTERN_YYYYMMDD}、{@link #PATTERN_YYYYMMDDHH}、{@link #PATTERN_YYYYMMDDHHMM}、
-     * @param sequenceLength 序列长度，大于0时有效，否则使用序列原始值，最多{@value #MAX_SEQUENCE_LENGTH}位，超过{@value #MAX_SEQUENCE_LENGTH}默认为{@value #MAX_SEQUENCE_LENGTH}位
-     * @param sequenceName   序列名，为空或null时则不生成序列值
-     * @param randomLength   随机数长度，大于0时有效，最多{@value #MAX_RANDOM_LENGTH}位，超过{@value #MAX_RANDOM_LENGTH}默认为{@value #MAX_RANDOM_LENGTH}位
-     * @return prefix+timestamp+sequence+random
-     */
-    public static String gen(String prefix, String pattern, int sequenceLength,
-                             String sequenceName, int randomLength) {
-        StringBuilder ids = new StringBuilder();
-        if (!isEmpty(prefix)) {
-            ids.append(prefix);
-        }
-        String timestamp = null;
-        if (!isEmpty(pattern)) {
-            timestamp = getFormattedDate(pattern);
-        }
-        if (timestamp != null) {
-            ids.append(timestamp);
-        }
-        if (!isEmpty(sequenceName)) {
-            long sequence = gen(sequenceName);
-            if (sequenceLength > 0) {
-                if (sequenceLength > MAX_SEQUENCE_LENGTH) {
-                    sequenceLength = MAX_SEQUENCE_LENGTH;
-                }
-                String formatSequence = sequenceFormats.get(sequenceLength - 1)
-                        .format(sequence);
-                if (formatSequence.length() > sequenceLength) {
-                    formatSequence = formatSequence.substring(formatSequence
-                            .length() - sequenceLength);
-                }
-                ids.append(formatSequence);
-            } else {
-                ids.append(sequence);
-            }
-        }
-        //随机数长度大于0时添加随机数
-        if (randomLength > 0) {
-            String random = RandomStringUtils.randomNumeric(randomLength);
-            ids.append(random);
-        }
-        return ids.toString();
-    }
-
-    private static String getFormattedDate(String pattern) {
-        SimpleDateFormat sdf = commonDateFormats.get(pattern);
-        if (sdf == null) {
-            try {
-                sdf = new SimpleDateFormat(pattern);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if (sdf == null) {
-            return null;
-        }
-        java.util.Date now = new java.util.Date();
-        return sdf.format(now);
-    }
-
-    private static boolean isEmpty(String str) {
-        if (str == null || str.trim().isEmpty()) {
-            return true;
-        }
-        return false;
-    }
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 100; i++) {
-            System.out.println(RandomStringUtils.randomNumeric(1));
-            System.out.println(RandomStringUtils.randomNumeric(2));
-            System.out.println(RandomStringUtils.randomNumeric(4));
-        }
-        System.out.println(new DecimalFormat("00").format(103));
-        System.out.println(new DecimalFormat("000").format(13));
-
-    }
-
-}

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

@@ -6,9 +6,8 @@
 	<select id="getList" resultType="com.cnbm.admin.entity.SysDeptEntity">
 		select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
 		<where>
-			t1.valid = 1
 			<if test="deptIdList != null">
-				and t1.id in
+				t1.id in
 				<foreach item="id" collection="deptIdList" open="(" separator="," close=")">
 					#{id}
 				</foreach>
@@ -19,15 +18,15 @@
 
 	<select id="getById" resultType="com.cnbm.admin.entity.SysDeptEntity">
 		select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
-		where t1.id = #{value}  AND t1.valid = 1
+		where t1.id = #{value}
 	</select>
 
 	<select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity">
-		select t1.id, t1.pid from sys_dept t1  AND t1.valid = 1
+		select t1.id, t1.pid from sys_dept t1
 	</select>
 
 	<select id="getSubDeptIdList" resultType="long">
-		select id from sys_dept where pids like #{id}  AND valid = 1
+		select id from sys_dept where pids like #{id}
 	</select>
 
 </mapper>

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.cnbm.admin.dao.SysDictDataDao">
 
     <select id="getDictDataList" resultType="com.cnbm.admin.entity.DictData">
-        select dict_type_id, dict_label, dict_value from sys_dict_data WHERE  valid = 1 order by dict_type_id, sort
+        select dict_type_id, dict_label, dict_value from sys_dict_data order by dict_type_id, sort
     </select>
 
 </mapper>

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.cnbm.admin.dao.SysDictTypeDao">
 
     <select id="getDictTypeList" resultType="com.cnbm.admin.entity.DictType">
-        select id, dict_type from sys_dict_type WHERE valid = 1 order by dict_type, sort
+        select id, dict_type from sys_dict_type order by dict_type, sort
     </select>
 
 </mapper>

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

@@ -5,15 +5,14 @@
 
 	<select id="getById" resultType="com.cnbm.admin.entity.SysMenuEntity">
 		select t1.*, (select name from sys_menu t2 where t2.id=t1.pid) as parentName from sys_menu t1
-			where t1.id = #{id}  AND t1.valid = 1
+			where t1.id = #{id}
 	</select>
 
 	<select id="getMenuList" resultType="com.cnbm.admin.entity.SysMenuEntity">
 		select t1.* from sys_menu t1
 		<where>
-			t1.valid = 1
 			<if test="type != null">
-				and t1.type = #{type}
+				t1.type = #{type}
 			</if>
 		</where>
 		order by t1.sort asc
@@ -23,7 +22,7 @@
 		select t3.* from sys_role_user t1
 		left join sys_role_menu t2 on t1.role_id = t2.role_id
 		left join sys_menu t3 on t2.menu_id = t3.id
-		where t1.user_id = #{userId}  AND t1.valid = 1
+		where t1.user_id = #{userId}
 		<if test="type != null">
 			and t3.type = #{type}
 		</if>
@@ -33,15 +32,15 @@
 	<select id="getUserPermissionsList" resultType="string">
 		select t3.permissions from sys_role_user t1 left join sys_role_menu t2 on t1.role_id = t2.role_id
 			left join sys_menu t3 on t2.menu_id = t3.id
-		where t1.user_id = #{userId}  AND t1.valid = 1 order by t3.sort asc
+		where t1.user_id = #{userId} order by t3.sort asc
 	</select>
 
 	<select id="getPermissionsList" resultType="string">
-		select permissions from sys_menu  WHERE valid = 1
+		select permissions from sys_menu
 	</select>
 
 	<select id="getListPid" resultType="com.cnbm.admin.entity.SysMenuEntity">
-		select * from sys_menu where pid = #{value}  AND valid = 1
+		select * from sys_menu where pid = #{value}
 	</select>
 	
 </mapper>

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

@@ -5,7 +5,7 @@
 
     <!-- 根据参数编码，查询value -->
 	<select id="getValueByCode" resultType="String">
-        select param_value from sys_params where param_code = #{value}  AND valid = 1
+        select param_value from sys_params where param_code = #{value}
     </select>
 
     <!-- 获取参数编码列表 -->
@@ -14,11 +14,10 @@
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-        AND valid = 1
     </select>
 
     <!-- 根据参数编码，更新value -->
     <update id="updateValueByCode">
-        update sys_params set param_value = #{paramValue} where param_code = #{paramCode}  AND valid = 1
+        update sys_params set param_value = #{paramValue} where param_code = #{paramCode}
     </update>
 </mapper>

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

@@ -4,13 +4,12 @@
 <mapper namespace="com.cnbm.admin.dao.SysRoleDataScopeDao">
 
     <select id="getDeptIdList" resultType="long">
-        select dept_id from sys_role_data_scope where role_id = #{value}  AND valid = 1
+        select dept_id from sys_role_data_scope where role_id = #{value}
     </select>
 
     <select id="getDataScopeList" resultType="long">
         select t2.dept_id from sys_role_user t1, sys_role_data_scope t2
           where t1.user_id = #{value} and t1.role_id = t2.role_id
-            AND t1.valid = 1
     </select>
 
     <delete id="deleteByRoleIds">
@@ -18,7 +17,6 @@
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
-        AND valid = 1
     </delete>
 
 </mapper>

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.cnbm.admin.dao.SysRoleMenuDao">
 
 	<select id="getMenuIdList" resultType="long">
-		select menu_id from sys_role_menu where role_id = #{value}  AND valid = 1
+		select menu_id from sys_role_menu where role_id = #{value}
 	</select>
 
 	<delete id="deleteByRoleIds">
@@ -12,10 +12,9 @@
 		<foreach item="roleId" collection="array" open="(" separator="," close=")">
 			#{roleId}
 		</foreach>
-		AND valid = 1
 	</delete>
 
 	<delete id="deleteByMenuId">
-		delete from sys_role_menu where menu_id = #{value}  AND valid = 1
+		delete from sys_role_menu where menu_id = #{value}
 	</delete>
 </mapper>

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

@@ -8,7 +8,6 @@
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
-        AND valid = 1
     </delete>
 
     <delete id="deleteByUserIds">
@@ -16,11 +15,10 @@
         <foreach item="userId" collection="array" open="(" separator="," close=")">
             #{userId}
         </foreach>
-        AND valid = 1
     </delete>
 
     <select id="getRoleIdList" resultType="long">
-        select role_id from sys_role_user where user_id = #{value}  AND valid = 1
+        select role_id from sys_role_user where user_id = #{value}
     </select>
 
 </mapper>

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

@@ -5,7 +5,7 @@
 
 	<select id="getList" resultType="com.cnbm.admin.entity.SysUserEntity">
 		select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1
-		where t1.super_admin = 0 AND t1.valid = 1
+		where t1.super_admin = 0
 		<if test="username != null and username.trim() != ''">
 			and t1.username like #{username}
 		</if>
@@ -25,19 +25,19 @@
 
 	<select id="getById" resultType="com.cnbm.admin.entity.SysUserEntity">
 		select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1
-			where t1.id = #{value}  AND t1.valid = 1
+			where t1.id = #{value}
 	</select>
 
 	<select id="getByUsername" resultType="com.cnbm.admin.entity.SysUserEntity">
-		select * from sys_user where username = #{value}  AND valid = 1
+		select * from sys_user where username = #{value}
 	</select>
 
 	<update id="updatePassword">
-		update sys_user set password = #{newPassword} where id = #{id}  AND valid = 1
+		update sys_user set password = #{newPassword} where id = #{id}
 	</update>
 
 	<select id="getCountByDeptId" resultType="int">
-		select count(*) from sys_user where dept_id = #{value}  AND valid = 1
+		select count(*) from sys_user where dept_id = #{value}
 	</select>
 
 	<select id="getUserIdListByDeptId" resultType="Long">
@@ -45,7 +45,6 @@
 			<foreach item="deptId" collection="list" open="(" separator="," close=")">
 				#{deptId}
 			</foreach>
-		AND valid = 1
 	</select>
 
 </mapper>

ym-gateway/src/main/resources/application-dev.yml

@@ -1,15 +1,10 @@
 spring:
   datasource:
+      #MySQL
       driver-class-name: com.mysql.cj.jdbc.Driver
-      #MySQL-local
+      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      username: root
-#      username: cigs4
+      password: 1qaz@WSX3edc$RFV
-#      password: 1qazxsw2
-
-      #MySQL-remote
-#      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      username: root
-#      password: 1qaz@WSX3edc$RFV
       #      #Oracle
       #      driver-class-name: oracle.jdbc.OracleDriver
       #      url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@@ -59,22 +54,13 @@ spring:
 ##多数据源的配置，需要引用renren-dynamic-datasource
 dynamic:
   datasource:
-#    ## 本mes系统
+    slave1:
-#    slave1:
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      username: root
-#      password: 1qaz@WSX3edc$RFV
-    ## camline系统 - remote
-    camline:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      url: jdbc:mysql://mysql.picaiba.com:30307/spc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      username: root
+      password: 1qaz@WSX3edc$RFV
+    slave2:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://mysql.picaiba.com:30307/spc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
       username: root
       password: 1qaz@WSX3edc$RFV
-#
-    #camline系统 - local
-#    camline:
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      username: offline_data
-#      password: tpvmfab4

ym-gateway/src/main/resources/application.yml

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

ym-gateway/src/main/resources/logback.xml

@@ -1,434 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
-                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
-    <contextName>logback-spring</contextName>
-
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-
-<!--    <property name="logging.pathwork" value="C:/qgs_logger/work" />-->
-<!--    <property name="logging.pathopc" value="C:/qgs_logger/opc" />-->
-<!--    <property name="logging.pathmq" value="C:/qgs_logger/mq" />-->
-<!--    <property name="logging.eqlog" value="C:/qgs_logger/s7" />-->
-
-    <property name="logging.eqlog" value="/usr/local/logger/EQCommunicationLog" />
-    <property name="logging.packing" value="/usr/local/logger/Packing" />
-    <property name="logging.pathwork" value="/usr/local/logger/Working" />
-
-
-    <!--0. 日志格式和颜色渲染 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-
-
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
-
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.pathwork}/debug/work-log-debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.pathwork}/work-log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="EQ_COMM_LOG_DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.eqlog}/debug/s7-log-debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.eqlog}/s7-eq-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="PACKING_LOG_DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.packing}/debug/packing-log-debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.packing}/packing-log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.pathwork}/info/work-log-info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.pathwork}/work-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="EQ_COMM_LOG_INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.eqlog}/info/s7-eq-info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.eqlog}/s7-eq-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="PACKING_LOG_INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.packing}/info/packing-log-info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.packing}/packing-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.pathwork}/warn/work-log-warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
-<!--            <fileNamePattern>${logging.pathwork}/work-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>-->
-<!--            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
-<!--                <maxFileSize>100MB</maxFileSize>-->
-<!--            </timeBasedFileNamingAndTriggeringPolicy>-->
-<!--            &lt;!&ndash;日志文档保留天数&ndash;&gt;-->
-<!--            <maxHistory>999</maxHistory>-->
-<!--        </rollingPolicy>-->
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.pathwork}/work-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="EQ_COMM_LOG_WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.eqlog}/warn/s7-log-warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.eqlog}/s7-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="PACKING_LOG_WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.packing}/warn/packing-log-warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.packing}/packing-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.pathwork}/error/work-log-error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
-<!--            <fileNamePattern>${logging.pathwork}/work-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>-->
-<!--            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
-<!--                <maxFileSize>100MB</maxFileSize>-->
-<!--            </timeBasedFileNamingAndTriggeringPolicy>-->
-<!--            &lt;!&ndash;日志文档保留天数&ndash;&gt;-->
-<!--            <maxHistory>999</maxHistory>-->
-<!--        </rollingPolicy>-->
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.pathwork}/work-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="EQ_COMM_LOG_ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.eqlog}/error/s7-log-error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.eqlog}/s7-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <appender name="PACKING_LOG_ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${logging.packing}/error/packing-log-error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <fileNamePattern>${logging.packing}/packing-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>999</maxHistory>
-            <totalSizeCap>200GB</totalSizeCap>
-        </rollingPolicy>
-
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性，
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
-              如果未设置此属性，那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-        <logger name="org.springframework.web" level="info"/>
-        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
-    -->
-
-    <!--
-        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-        【logging.level.org.mybatis=debug logging.level.dao=debug】
-     -->
-
-    <!--
-        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-    -->
-
-    <!-- name就是包名，这个包下的 所有logger 输出就以下配置（这里的logger只会输出代码里 你指定打印的log ） -->
-
-<!--    <logger name="com.cnbm.pathwork" additivity="false">-->
-<!--        <appender-ref ref="WORKING_DEBUG_FILE" />-->
-<!--        <appender-ref ref="WORKING_INFO_FILE" />-->
-<!--        <appender-ref ref="WORKING_WARN_FILE" />-->
-<!--        <appender-ref ref="WORKING_ERROR_FILE" />-->
-<!--    </logger>-->
-    <logger name="com.cnbm.dispatch" additivity="false">
-        <appender-ref ref="EQ_COMM_LOG_DEBUG_FILE" />
-        <appender-ref ref="EQ_COMM_LOG_INFO_FILE" />
-        <appender-ref ref="EQ_COMM_LOG_WARN_FILE" />
-        <appender-ref ref="EQ_COMM_LOG_ERROR_FILE" />
-    </logger>
-
-    <logger name="com.cnbm.packing" additivity="false">
-        <appender-ref ref="PACKING_LOG_DEBUG_FILE" />
-        <appender-ref ref="PACKING_LOG_INFO_FILE" />
-        <appender-ref ref="PACKING_LOG_WARN_FILE" />
-        <appender-ref ref="PACKING_LOG_ERROR_FILE" />
-    </logger>
-
-    <!--    work这个目录 是所有控制台信息 + 第三方jar包 输出的信息  -->
-    <root level="info">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="DEBUG_FILE" />
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="WARN_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!-- 4.2 生产环境:输出到文档
-    <springProfile name="pro">
-        <root level="info">
-            <appender-ref ref="CONSOLE" />
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile> -->
-</configuration>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,80 +0,0 @@
-package com.cnbm.generator.code.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-
-
-/**
- * 包装箱拆合箱历史表
- *
- * @author codeGenerator
- * @since  2023-02-16
- */
-@Data
-@ApiModel(value = "包装箱拆合箱历史表DTO对象")
-public class ChangePackagingBoxHistoryDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-
-	@ApiModelProperty(value = "ID")
-	private Long id;
-
-	@ApiModelProperty(value = "基板ID或模组id")
-	private String substrateId;
-
-	@ApiModelProperty(value = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
-	private Long sourceBoxNo;
-
-	@ApiModelProperty(value = "源箱slot")
-	private Integer sourceSlot;
-
-	@ApiModelProperty(value = "离开时间")
-	private LocalDateTime leaveTime;
-
-	@ApiModelProperty(value = "目标箱box no, 关联t_wo_packaging_box.box_no 字段")
-	private Long targetBoxNo;
-
-	@ApiModelProperty(value = "目标箱slot")
-	private Integer targetSlot;
-
-	@ApiModelProperty(value = "进入时间")
-	private LocalDateTime inputTime;
-
-	@ApiModelProperty(value = "等级")
-	private String grade;
-
-	@ApiModelProperty(value = "类型，1为拆箱，2为合箱")
-	private Integer type;
-
-	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
-	private Integer valid;
-
-	@ApiModelProperty(value = "创建人")
-	private Long creatorId;
-
-	@ApiModelProperty(value = "创建人姓名")
-	private String creatorName;
-
-	@ApiModelProperty(value = "创建时间")
-	private LocalDateTime createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private Long updaterId;
-
-	@ApiModelProperty(value = "更新人姓名")
-	private String updaterName;
-
-	@ApiModelProperty(value = "更新时间")
-	private LocalDateTime updateTime;
-
-	@ApiModelProperty(value = "版本号")
-	private Integer version;
-
-}

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

@@ -1,80 +0,0 @@
-package com.cnbm.generator.code.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-
-
-/**
- * 打印标签模板表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-@Data
-@ApiModel(value = "打印标签模板表DTO对象")
-public class PrintModelDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-
-	@ApiModelProperty(value = "id")
-	private Long id;
-
-	@ApiModelProperty(value = "编码")
-	private String code;
-
-	@ApiModelProperty(value = "班组名称")
-	private String name;
-
-	@ApiModelProperty(value = "启用状态:0 、停用，1、启用")
-	private Integer enabled;
-
-	@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;
-
-	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
-	private Integer valid;
-
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-	@ApiModelProperty(value = "类型，0：模组标签，1：等级标签")
-	private Integer type;
-
-	@ApiModelProperty(value = "是否默认模板，0：否，1：是")
-	private Integer isDefault;
-
-	@ApiModelProperty(value = "是否要预览，0：否，1：是")
-	private Integer isPreview;
-
-	@ApiModelProperty(value = "模板内容")
-	private String content;
-
-	@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
-	private Integer lineBody;
-
-}

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

@@ -1,74 +0,0 @@
-package com.cnbm.generator.code.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-
-
-/**
- * 基板补偿功率 表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-@Data
-@ApiModel(value = "基板补偿功率 表DTO对象")
-public class WoCompensationPowerDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-
-	@ApiModelProperty(value = "ID")
-	private Long id;
-
-	@ApiModelProperty(value = "实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
-	private Float actlPmppLow;
-
-	@ApiModelProperty(value = "实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
-	private Float actlPmppHigh;
-
-	@ApiModelProperty(value = "计算公式")
-	private String formula;
-
-	@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
-	private Integer lineBody;
-
-	@ApiModelProperty(value = "系数a,（手动录入）")
-	private Float coefficientA;
-
-	@ApiModelProperty(value = "系数b,（手动录入）")
-	private Float coefficientB;
-
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
-	private Integer valid;
-
-	@ApiModelProperty(value = "创建人")
-	private Long creatorId;
-
-	@ApiModelProperty(value = "创建人姓名")
-	private String creatorName;
-
-	@ApiModelProperty(value = "创建时间")
-	private LocalDateTime createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private Long updaterId;
-
-	@ApiModelProperty(value = "更新人姓名")
-	private String updaterName;
-
-	@ApiModelProperty(value = "更新时间")
-	private LocalDateTime updateTime;
-
-	@ApiModelProperty(value = "版本号")
-	private Integer version;
-
-}

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

@@ -1,116 +0,0 @@
-package com.cnbm.generator.code.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-
-
-/**
- * 包装箱表
- *
- * @author codeGenerator
- * @since  2023-02-23
- */
-@Data
-@ApiModel(value = "包装箱表DTO对象")
-public class WoPackagingBoxDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-
-	@ApiModelProperty(value = "ID")
-	private Long id;
-
-	@ApiModelProperty(value = "订单ID(舍弃)")
-	private Long orderId;
-
-	@ApiModelProperty(value = "工单ID（舍弃啊）")
-	private Long workOrderId;
-
-	@ApiModelProperty(value = "包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId")
-	private String boxNo;
-
-	@ApiModelProperty(value = "功率，单位瓦（舍弃）")
-	private Integer power;
-
-	@ApiModelProperty(value = "等级（舍弃）")
-	private Integer grade;
-
-	@ApiModelProperty(value = "基板数量，每个包装箱最大20片（舍弃）")
-	private Integer substrateQuantity;
-
-	@ApiModelProperty(value = "装箱完成时间，指的是包装完成时间")
-	private LocalDateTime packagingTime;
-
-	@ApiModelProperty(value = "打印时间（最近一次打印时间）")
-	private LocalDateTime printTime;
-
-	@ApiModelProperty(value = "打印状态：0、未打印，1、已打印")
-	private Integer printStatus;
-
-	@ApiModelProperty(value = "报工状态：0、未报工，1、已报工(舍弃)")
-	private Integer completionReportingStatus;
-
-	@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;
-
-	@ApiModelProperty(value = "离开产线时间（舍弃）")
-	private LocalDateTime leaveLineTime;
-
-	@ApiModelProperty(value = "下片端口id（舍弃）")
-	private String portId;
-
-	@ApiModelProperty(value = "打印次数")
-	private Integer printCount;
-
-	@ApiModelProperty(value = "功率等级")
-	private String powerLevel;
-
-	@ApiModelProperty(value = "客户id（舍弃）")
-	private Long customerId;
-
-	@ApiModelProperty(value = "SAP MATERIAL,从t_wo_power_level 对应过来的")
-	private String sapMaterial;
-
-	@ApiModelProperty(value = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
-	private Integer lineBody;
-
-	@ApiModelProperty(value = "模式，1-手动模式；2-自动模式")
-	private Integer model;
-
-	@ApiModelProperty(value = "是否到达包装台，1=到达；2=未达到")
-	private Integer isArrived;
-
-	@ApiModelProperty(value = "订单号")
-	private String orderNum;
-
-}

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

@@ -1,176 +0,0 @@
-package com.cnbm.generator.code.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-
-
-/**
- * 包装箱基板关联表 ( 基板表 )
- *
- * @author codeGenerator
- * @since  2023-03-03
- */
-@Data
-@ApiModel(value = "包装箱基板关联表 ( 基板表 )DTO对象")
-public class WoPackagingBoxSubstrateDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-
-	@ApiModelProperty(value = "ID")
-	private Long id;
-
-	@ApiModelProperty(value = "包装箱ID，BoxId")
-	private String packagingBoxId;
-
-	@ApiModelProperty(value = "基板ID")
-	private String woSubstrateId;
-
-	@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;
-
-	@ApiModelProperty(value = "箱中位置")
-	private Integer slot;
-
-	@ApiModelProperty(value = "进入时间")
-	private LocalDateTime inputTime;
-
-	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
-	private Integer valid;
-
-	@ApiModelProperty(value = "SAP MATERIAL,从t_wo_power_level 对应过来的")
-	private String sapMaterial;
-
-	@ApiModelProperty(value = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
-	private Integer lineBody;
-
-	@ApiModelProperty(value = "功率等级")
-	private String powerLevel;
-
-	@ApiModelProperty(value = "")
-	private LocalDateTime lastUpdateTime;
-
-	@ApiModelProperty(value = "补偿后的功率，pmpp")
-	private Float pmpp;
-
-	@ApiModelProperty(value = "订单名")
-	private String orderName;
-
-	@ApiModelProperty(value = "")
-	private Long binclassFl1;
-
-	@ApiModelProperty(value = "")
-	private Long binclassFl2;
-
-	@ApiModelProperty(value = "")
-	private Float etaFl1;
-
-	@ApiModelProperty(value = "")
-	private Float etaFl2;
-
-	@ApiModelProperty(value = "")
-	private Float ffFl1;
-
-	@ApiModelProperty(value = "")
-	private Float ffFl2;
-
-	@ApiModelProperty(value = "")
-	private Float imppFl1;
-
-	@ApiModelProperty(value = "")
-	private Float imppFl2;
-
-	@ApiModelProperty(value = "")
-	private Float insolflashcontrolFl1;
-
-	@ApiModelProperty(value = "")
-	private Float insolflashcontrolFl2;
-
-	@ApiModelProperty(value = "")
-	private Float insolmppFl1;
-
-	@ApiModelProperty(value = "")
-	private Float insolmppFl2;
-
-	@ApiModelProperty(value = "")
-	private Float insolvocFl1;
-
-	@ApiModelProperty(value = "")
-	private Float insolvocFl2;
-
-	@ApiModelProperty(value = "")
-	private Float insolFl1;
-
-	@ApiModelProperty(value = "")
-	private Float insolFl2;
-
-	@ApiModelProperty(value = "")
-	private Float iscFl1;
-
-	@ApiModelProperty(value = "")
-	private Float iscFl2;
-
-	@ApiModelProperty(value = "")
-	private LocalDateTime measTimeFl1;
-
-	@ApiModelProperty(value = "")
-	private LocalDateTime measTimeFl2;
-
-	@ApiModelProperty(value = "")
-	private Float pmppFl1;
-
-	@ApiModelProperty(value = "")
-	private Float pmppFl2;
-
-	@ApiModelProperty(value = "")
-	private Float tcellFl1;
-
-	@ApiModelProperty(value = "")
-	private Float tcellFl2;
-
-	@ApiModelProperty(value = "")
-	private Float tmonicellFl1;
-
-	@ApiModelProperty(value = "")
-	private Float tmonicellFl2;
-
-	@ApiModelProperty(value = "")
-	private Float umppFl1;
-
-	@ApiModelProperty(value = "")
-	private Float umppFl2;
-
-	@ApiModelProperty(value = "")
-	private Float uocFl1;
-
-	@ApiModelProperty(value = "")
-	private Float uocFl2;
-
-	@ApiModelProperty(value = "真实PMPP")
-	private Float actualPmpp;
-
-}

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

@@ -1,83 +0,0 @@
-package com.cnbm.generator.code.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-
-
-/**
- * 包装箱打印历史表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-@Data
-@ApiModel(value = "包装箱打印历史表DTO对象")
-public class WoPackagingPrintHistoryDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-
-	@ApiModelProperty(value = "ID")
-	private Long id;
-
-	@ApiModelProperty(value = "包装箱编号，关联t_wo_packaging_box.box_no")
-	private Long boxNo;
-
-	@ApiModelProperty(value = "打印时间")
-	private LocalDateTime printTime;
-
-	@ApiModelProperty(value = "报工时间（舍弃）")
-	private LocalDateTime completionReportingTime;
-
-	@ApiModelProperty(value = "打印状态：0、未打印，1、已打印")
-	private Integer printStatus;
-
-	@ApiModelProperty(value = "报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）")
-	private Integer completionReportingStatus;
-
-	@ApiModelProperty(value = "移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）")
-	private LocalDateTime leaveLineTime;
-
-	@ApiModelProperty(value = "下片端口id（舍弃）")
-	private String portId;
-
-	@ApiModelProperty(value = "打印次数")
-	private Integer printCount;
-
-	@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;
-
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-	@ApiModelProperty(value = "模式，1-手动模式；2-自动模式")
-	private Integer model;
-
-}

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

@@ -1,83 +0,0 @@
-package com.cnbm.generator.code.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-
-
-/**
- * 功率等级 表
- *
- * @author codeGenerator
- * @since  2023-02-22
- */
-@Data
-@ApiModel(value = "功率等级 表DTO对象")
-public class WoPowerLevelDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-
-	@ApiModelProperty(value = "ID")
-	private Long id;
-
-	@ApiModelProperty(value = "功率等级名称，（现场人员手动录入）")
-	private String powerClass;
-
-	@ApiModelProperty(value = "pmpp_low,（现场人员手动录入）")
-	private Float pmppLow;
-
-	@ApiModelProperty(value = "pmpp_high,（现场人员手动录入）")
-	private Float pmppHigh;
-
-	@ApiModelProperty(value = "物料号,（现场人员手动录入）")
-	private String sapMaterialNum;
-
-	@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
-	private Integer lineBody;
-
-	@ApiModelProperty(value = "lable_voc,（手动录入）")
-	private BigDecimal lableVoc;
-
-	@ApiModelProperty(value = "lable_isc,（手动录入）")
-	private BigDecimal lableIsc;
-
-	@ApiModelProperty(value = "lable_vmpp,（手动录入）")
-	private BigDecimal lableVmpp;
-
-	@ApiModelProperty(value = "lable_impp,（手动录入）")
-	private BigDecimal lableImpp;
-
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
-	private Integer valid;
-
-	@ApiModelProperty(value = "创建人")
-	private Long creatorId;
-
-	@ApiModelProperty(value = "创建人姓名")
-	private String creatorName;
-
-	@ApiModelProperty(value = "创建时间")
-	private LocalDateTime createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private Long updaterId;
-
-	@ApiModelProperty(value = "更新人姓名")
-	private String updaterName;
-
-	@ApiModelProperty(value = "更新时间")
-	private LocalDateTime updateTime;
-
-	@ApiModelProperty(value = "版本号")
-	private Integer version;
-
-}

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

@@ -1,118 +0,0 @@
-package com.cnbm.generator.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 包装箱拆合箱历史表
- * </p>
- *
- * @author codeGenerator
- * @since 2023-02-16
- */
-@Data
-@TableName("t_change_packaging_box_history")
-@ApiModel(value = "ChangePackagingBoxHistory对象", description = "包装箱拆合箱历史表")
-public class ChangePackagingBoxHistory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("基板ID或模组id")
-    private String substrateId;
-
-    @ApiModelProperty("源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
-    private Long sourceBoxNo;
-
-    @ApiModelProperty("源箱slot")
-    private Integer sourceSlot;
-
-    @ApiModelProperty("离开时间")
-    private LocalDateTime leaveTime;
-
-    @ApiModelProperty("目标箱box no, 关联t_wo_packaging_box.box_no 字段")
-    private Long targetBoxNo;
-
-    @ApiModelProperty("目标箱slot")
-    private Integer targetSlot;
-
-    @ApiModelProperty("进入时间")
-    private LocalDateTime inputTime;
-
-    @ApiModelProperty("等级")
-    private String grade;
-
-    @ApiModelProperty("类型，1为拆箱，2为合箱")
-    private Integer type;
-
-    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
-    @TableLogic
-    private Integer valid;
-
-    @ApiModelProperty("创建人")
-    private Long creatorId;
-
-    @ApiModelProperty("创建人姓名")
-    private String creatorName;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("更新人")
-    private Long updaterId;
-
-    @ApiModelProperty("更新人姓名")
-    private String updaterName;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty("版本号")
-    private Integer version;
-
-
-    public static final String ID = "ID";
-
-    public static final String SUBSTRATE_ID = "SUBSTRATE_ID";
-
-    public static final String SOURCE_BOX_NO = "SOURCE_BOX_NO";
-
-    public static final String SOURCE_SLOT = "SOURCE_SLOT";
-
-    public static final String LEAVE_TIME = "LEAVE_TIME";
-
-    public static final String TARGET_BOX_NO = "TARGET_BOX_NO";
-
-    public static final String TARGET_SLOT = "TARGET_SLOT";
-
-    public static final String INPUT_TIME = "INPUT_TIME";
-
-    public static final String GRADE = "GRADE";
-
-    public static final String TYPE = "TYPE";
-
-    public static final String VALID = "VALID";
-
-    public static final String CREATOR_ID = "CREATOR_ID";
-
-    public static final String CREATOR_NAME = "CREATOR_NAME";
-
-    public static final String CREATE_TIME = "CREATE_TIME";
-
-    public static final String UPDATER_ID = "UPDATER_ID";
-
-    public static final String UPDATER_NAME = "UPDATER_NAME";
-
-    public static final String UPDATE_TIME = "UPDATE_TIME";
-
-    public static final String VERSION = "VERSION";
-
-}

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

@@ -1,118 +0,0 @@
-package com.cnbm.generator.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 打印标签模板表
- * </p>
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Data
-@TableName("t_print_model")
-@ApiModel(value = "PrintModel对象", description = "打印标签模板表")
-public class PrintModel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("id")
-    private Long id;
-
-    @ApiModelProperty("编码")
-    private String code;
-
-    @ApiModelProperty("班组名称")
-    private String name;
-
-    @ApiModelProperty("启用状态:0 、停用，1、启用")
-    private Integer enabled;
-
-    @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;
-
-    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
-    @TableLogic
-    private Integer valid;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("类型，0：模组标签，1：等级标签")
-    private Integer type;
-
-    @ApiModelProperty("是否默认模板，0：否，1：是")
-    private Integer isDefault;
-
-    @ApiModelProperty("是否要预览，0：否，1：是")
-    private Integer isPreview;
-
-    @ApiModelProperty("模板内容")
-    private String content;
-
-    @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
-    private Integer lineBody;
-
-
-    public static final String ID = "ID";
-
-    public static final String CODE = "CODE";
-
-    public static final String NAME = "NAME";
-
-    public static final String ENABLED = "ENABLED";
-
-    public static final String CREATOR_ID = "CREATOR_ID";
-
-    public static final String CREATOR_NAME = "CREATOR_NAME";
-
-    public static final String CREATE_TIME = "CREATE_TIME";
-
-    public static final String UPDATER_ID = "UPDATER_ID";
-
-    public static final String UPDATER_NAME = "UPDATER_NAME";
-
-    public static final String UPDATE_TIME = "UPDATE_TIME";
-
-    public static final String VERSION = "VERSION";
-
-    public static final String VALID = "VALID";
-
-    public static final String REMARK = "REMARK";
-
-    public static final String TYPE = "TYPE";
-
-    public static final String IS_DEFAULT = "IS_DEFAULT";
-
-    public static final String IS_PREVIEW = "IS_PREVIEW";
-
-    public static final String CONTENT = "CONTENT";
-
-    public static final String LINE_BODY = "line_body";
-
-}

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

@@ -1,108 +0,0 @@
-package com.cnbm.generator.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 基板补偿功率 表
- * </p>
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Data
-@TableName("t_wo_compensation_power")
-@ApiModel(value = "WoCompensationPower对象", description = "基板补偿功率 表")
-public class WoCompensationPower implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
-    private Float actlPmppLow;
-
-    @ApiModelProperty("实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
-    private Float actlPmppHigh;
-
-    @ApiModelProperty("计算公式")
-    private String formula;
-
-    @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
-    private Integer lineBody;
-
-    @ApiModelProperty("系数a,（手动录入）")
-    private Float coefficientA;
-
-    @ApiModelProperty("系数b,（手动录入）")
-    private Float coefficientB;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
-    @TableLogic
-    private Integer valid;
-
-    @ApiModelProperty("创建人")
-    private Long creatorId;
-
-    @ApiModelProperty("创建人姓名")
-    private String creatorName;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("更新人")
-    private Long updaterId;
-
-    @ApiModelProperty("更新人姓名")
-    private String updaterName;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty("版本号")
-    private Integer version;
-
-
-    public static final String ID = "id";
-
-    public static final String ACTL_PMPP_LOW = "actl_pmpp_low";
-
-    public static final String ACTL_PMPP_HIGH = "actl_pmpp_high";
-
-    public static final String FORMULA = "formula";
-
-    public static final String LINE_BODY = "line_body";
-
-    public static final String COEFFICIENT_A = "coefficient_a";
-
-    public static final String COEFFICIENT_B = "coefficient_b";
-
-    public static final String REMARK = "remark";
-
-    public static final String VALID = "valid";
-
-    public static final String CREATOR_ID = "creator_id";
-
-    public static final String CREATOR_NAME = "creator_name";
-
-    public static final String CREATE_TIME = "create_time";
-
-    public static final String UPDATER_ID = "updater_id";
-
-    public static final String UPDATER_NAME = "updater_name";
-
-    public static final String UPDATE_TIME = "update_time";
-
-    public static final String VERSION = "version";
-
-}

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

@@ -1,178 +0,0 @@
-package com.cnbm.generator.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 包装箱表
- * </p>
- *
- * @author codeGenerator
- * @since 2023-02-23
- */
-@Data
-@TableName("t_wo_packaging_box")
-@ApiModel(value = "WoPackagingBox对象", description = "包装箱表")
-public class WoPackagingBox implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("订单ID(舍弃)")
-    private Long orderId;
-
-    @ApiModelProperty("工单ID（舍弃啊）")
-    private Long workOrderId;
-
-    @ApiModelProperty("包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId")
-    private String boxNo;
-
-    @ApiModelProperty("功率，单位瓦（舍弃）")
-    private Integer power;
-
-    @ApiModelProperty("等级（舍弃）")
-    private Integer grade;
-
-    @ApiModelProperty("基板数量，每个包装箱最大20片（舍弃）")
-    private Integer substrateQuantity;
-
-    @ApiModelProperty("装箱完成时间，指的是包装完成时间")
-    private LocalDateTime packagingTime;
-
-    @ApiModelProperty("打印时间（最近一次打印时间）")
-    private LocalDateTime printTime;
-
-    @ApiModelProperty("打印状态：0、未打印，1、已打印")
-    private Integer printStatus;
-
-    @ApiModelProperty("报工状态：0、未报工，1、已报工(舍弃)")
-    private Integer completionReportingStatus;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
-    @TableLogic
-    private Integer valid;
-
-    @ApiModelProperty("创建人")
-    private Long creatorId;
-
-    @ApiModelProperty("创建人姓名")
-    private String creatorName;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("更新人")
-    private Long updaterId;
-
-    @ApiModelProperty("更新人姓名")
-    private String updaterName;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty("版本号")
-    private Integer version;
-
-    @ApiModelProperty("离开产线时间（舍弃）")
-    private LocalDateTime leaveLineTime;
-
-    @ApiModelProperty("下片端口id（舍弃）")
-    private String portId;
-
-    @ApiModelProperty("打印次数")
-    private Integer printCount;
-
-    @ApiModelProperty("功率等级")
-    private String powerLevel;
-
-    @ApiModelProperty("客户id（舍弃）")
-    private Long customerId;
-
-    @ApiModelProperty("SAP MATERIAL,从t_wo_power_level 对应过来的")
-    private String sapMaterial;
-
-    @ApiModelProperty("线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
-    private Integer lineBody;
-
-    @ApiModelProperty("模式，1-手动模式；2-自动模式")
-    private Integer model;
-
-    @ApiModelProperty("是否到达包装台，1=到达；2=未达到")
-    private Integer isArrived;
-
-    @ApiModelProperty("订单号")
-    private String orderNum;
-
-
-    public static final String ID = "ID";
-
-    public static final String ORDER_ID = "ORDER_ID";
-
-    public static final String WORK_ORDER_ID = "WORK_ORDER_ID";
-
-    public static final String BOX_NO = "BOX_NO";
-
-    public static final String POWER = "POWER";
-
-    public static final String GRADE = "GRADE";
-
-    public static final String SUBSTRATE_QUANTITY = "SUBSTRATE_QUANTITY";
-
-    public static final String PACKAGING_TIME = "PACKAGING_TIME";
-
-    public static final String PRINT_TIME = "PRINT_TIME";
-
-    public static final String PRINT_STATUS = "PRINT_STATUS";
-
-    public static final String COMPLETION_REPORTING_STATUS = "COMPLETION_REPORTING_STATUS";
-
-    public static final String REMARK = "REMARK";
-
-    public static final String VALID = "VALID";
-
-    public static final String CREATOR_ID = "CREATOR_ID";
-
-    public static final String CREATOR_NAME = "CREATOR_NAME";
-
-    public static final String CREATE_TIME = "CREATE_TIME";
-
-    public static final String UPDATER_ID = "UPDATER_ID";
-
-    public static final String UPDATER_NAME = "UPDATER_NAME";
-
-    public static final String UPDATE_TIME = "UPDATE_TIME";
-
-    public static final String VERSION = "VERSION";
-
-    public static final String LEAVE_LINE_TIME = "LEAVE_LINE_TIME";
-
-    public static final String PORT_ID = "PORT_ID";
-
-    public static final String PRINT_COUNT = "PRINT_COUNT";
-
-    public static final String POWER_LEVEL = "POWER_LEVEL";
-
-    public static final String CUSTOMER_ID = "CUSTOMER_ID";
-
-    public static final String SAP_MATERIAL = "SAP_MATERIAL";
-
-    public static final String LINE_BODY = "LINE_BODY";
-
-    public static final String MODEL = "model";
-
-    public static final String IS_ARRIVED = "is_arrived";
-
-    public static final String ORDER_NUM = "ORDER_NUM";
-
-}

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

@@ -1,247 +0,0 @@
-package com.cnbm.generator.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 包装箱基板关联表 ( 基板表 )
- * </p>
- *
- * @author codeGenerator
- * @since 2023-03-03
- */
-@Data
-@TableName("t_wo_packaging_box_substrate")
-@ApiModel(value = "WoPackagingBoxSubstrate对象", description = "包装箱基板关联表 ( 基板表 )")
-public class WoPackagingBoxSubstrate implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("包装箱ID，BoxId")
-    private String packagingBoxId;
-
-    @ApiModelProperty("基板ID")
-    private String woSubstrateId;
-
-    @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;
-
-    @ApiModelProperty("箱中位置")
-    private Integer slot;
-
-    @ApiModelProperty("进入时间")
-    private LocalDateTime inputTime;
-
-    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
-    @TableLogic
-    private Integer valid;
-
-    @ApiModelProperty("SAP MATERIAL,从t_wo_power_level 对应过来的")
-    private String sapMaterial;
-
-    @ApiModelProperty("线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
-    private Integer lineBody;
-
-    @ApiModelProperty("功率等级")
-    private String powerLevel;
-
-    private LocalDateTime lastUpdateTime;
-
-    @ApiModelProperty("补偿后的功率，pmpp")
-    private Float pmpp;
-
-    @ApiModelProperty("订单名")
-    private String orderName;
-
-    private Long binclassFl1;
-
-    private Long binclassFl2;
-
-    private Float etaFl1;
-
-    private Float etaFl2;
-
-    private Float ffFl1;
-
-    private Float ffFl2;
-
-    private Float imppFl1;
-
-    private Float imppFl2;
-
-    private Float insolflashcontrolFl1;
-
-    private Float insolflashcontrolFl2;
-
-    private Float insolmppFl1;
-
-    private Float insolmppFl2;
-
-    private Float insolvocFl1;
-
-    private Float insolvocFl2;
-
-    private Float insolFl1;
-
-    private Float insolFl2;
-
-    private Float iscFl1;
-
-    private Float iscFl2;
-
-    private LocalDateTime measTimeFl1;
-
-    private LocalDateTime measTimeFl2;
-
-    private Float pmppFl1;
-
-    private Float pmppFl2;
-
-    private Float tcellFl1;
-
-    private Float tcellFl2;
-
-    private Float tmonicellFl1;
-
-    private Float tmonicellFl2;
-
-    private Float umppFl1;
-
-    private Float umppFl2;
-
-    private Float uocFl1;
-
-    private Float uocFl2;
-
-    @ApiModelProperty("真实PMPP")
-    private Float actualPmpp;
-
-
-    public static final String ID = "ID";
-
-    public static final String PACKAGING_BOX_ID = "PACKAGING_BOX_ID";
-
-    public static final String WO_SUBSTRATE_ID = "WO_SUBSTRATE_ID";
-
-    public static final String CREATOR_ID = "CREATOR_ID";
-
-    public static final String CREATOR_NAME = "CREATOR_NAME";
-
-    public static final String CREATE_TIME = "CREATE_TIME";
-
-    public static final String UPDATER_ID = "UPDATER_ID";
-
-    public static final String UPDATER_NAME = "UPDATER_NAME";
-
-    public static final String UPDATE_TIME = "UPDATE_TIME";
-
-    public static final String VERSION = "VERSION";
-
-    public static final String SLOT = "SLOT";
-
-    public static final String INPUT_TIME = "INPUT_TIME";
-
-    public static final String VALID = "VALID";
-
-    public static final String SAP_MATERIAL = "SAP_MATERIAL";
-
-    public static final String LINE_BODY = "LINE_BODY";
-
-    public static final String POWER_LEVEL = "POWER_LEVEL";
-
-    public static final String LAST_UPDATE_TIME = "LAST_UPDATE_TIME";
-
-    public static final String PMPP = "PMPP";
-
-    public static final String ORDER_NAME = "ORDER_NAME";
-
-    public static final String BINCLASS_FL1 = "BINCLASS_FL1";
-
-    public static final String BINCLASS_FL2 = "BINCLASS_FL2";
-
-    public static final String ETA_FL1 = "ETA_FL1";
-
-    public static final String ETA_FL2 = "ETA_FL2";
-
-    public static final String FF_FL1 = "FF_FL1";
-
-    public static final String FF_FL2 = "FF_FL2";
-
-    public static final String IMPP_FL1 = "IMPP_FL1";
-
-    public static final String IMPP_FL2 = "IMPP_FL2";
-
-    public static final String INSOLFLASHCONTROL_FL1 = "InsolFlashControl_FL1";
-
-    public static final String INSOLFLASHCONTROL_FL2 = "InsolFlashControl_FL2";
-
-    public static final String INSOLMPP_FL1 = "InsolMPP_FL1";
-
-    public static final String INSOLMPP_FL2 = "InsolMPP_FL2";
-
-    public static final String INSOLVOC_FL1 = "InsolVoc_FL1";
-
-    public static final String INSOLVOC_FL2 = "InsolVoc_FL2";
-
-    public static final String INSOL_FL1 = "Insol_FL1";
-
-    public static final String INSOL_FL2 = "Insol_FL2";
-
-    public static final String ISC_FL1 = "ISC_FL1";
-
-    public static final String ISC_FL2 = "ISC_FL2";
-
-    public static final String MEAS_TIME_FL1 = "MEAS_TIME_FL1";
-
-    public static final String MEAS_TIME_FL2 = "MEAS_TIME_FL2";
-
-    public static final String PMPP_FL1 = "PMPP_FL1";
-
-    public static final String PMPP_FL2 = "PMPP_FL2";
-
-    public static final String TCELL_FL1 = "Tcell_FL1";
-
-    public static final String TCELL_FL2 = "Tcell_FL2";
-
-    public static final String TMONICELL_FL1 = "Tmonicell_FL1";
-
-    public static final String TMONICELL_FL2 = "Tmonicell_FL2";
-
-    public static final String UMPP_FL1 = "UMPP_FL1";
-
-    public static final String UMPP_FL2 = "UMPP_FL2";
-
-    public static final String UOC_FL1 = "UOC_FL1";
-
-    public static final String UOC_FL2 = "UOC_FL2";
-
-    public static final String ACTUAL_PMPP = "ACTUAL_PMPP";
-
-}

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

@@ -1,123 +0,0 @@
-package com.cnbm.generator.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 包装箱打印历史表
- * </p>
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Data
-@TableName("t_wo_packaging_print_history")
-@ApiModel(value = "WoPackagingPrintHistory对象", description = "包装箱打印历史表")
-public class WoPackagingPrintHistory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("包装箱编号，关联t_wo_packaging_box.box_no")
-    private Long boxNo;
-
-    @ApiModelProperty("打印时间")
-    private LocalDateTime printTime;
-
-    @ApiModelProperty("报工时间（舍弃）")
-    private LocalDateTime completionReportingTime;
-
-    @ApiModelProperty("打印状态：0、未打印，1、已打印")
-    private Integer printStatus;
-
-    @ApiModelProperty("报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）")
-    private Integer completionReportingStatus;
-
-    @ApiModelProperty("移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）")
-    private LocalDateTime leaveLineTime;
-
-    @ApiModelProperty("下片端口id（舍弃）")
-    private String portId;
-
-    @ApiModelProperty("打印次数")
-    private Integer printCount;
-
-    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
-    @TableLogic
-    private Integer valid;
-
-    @ApiModelProperty("创建人")
-    private Long creatorId;
-
-    @ApiModelProperty("创建人姓名")
-    private String creatorName;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("更新人")
-    private Long updaterId;
-
-    @ApiModelProperty("更新人姓名")
-    private String updaterName;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty("版本号")
-    private Integer version;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("模式，1-手动模式；2-自动模式")
-    private Integer model;
-
-
-    public static final String ID = "ID";
-
-    public static final String BOX_NO = "BOX_NO";
-
-    public static final String PRINT_TIME = "PRINT_TIME";
-
-    public static final String COMPLETION_REPORTING_TIME = "COMPLETION_REPORTING_TIME";
-
-    public static final String PRINT_STATUS = "PRINT_STATUS";
-
-    public static final String COMPLETION_REPORTING_STATUS = "COMPLETION_REPORTING_STATUS";
-
-    public static final String LEAVE_LINE_TIME = "LEAVE_LINE_TIME";
-
-    public static final String PORT_ID = "PORT_ID";
-
-    public static final String PRINT_COUNT = "PRINT_COUNT";
-
-    public static final String VALID = "VALID";
-
-    public static final String CREATOR_ID = "CREATOR_ID";
-
-    public static final String CREATOR_NAME = "CREATOR_NAME";
-
-    public static final String CREATE_TIME = "CREATE_TIME";
-
-    public static final String UPDATER_ID = "UPDATER_ID";
-
-    public static final String UPDATER_NAME = "UPDATER_NAME";
-
-    public static final String UPDATE_TIME = "UPDATE_TIME";
-
-    public static final String VERSION = "VERSION";
-
-    public static final String REMARK = "REMARK";
-
-    public static final String MODEL = "model";
-
-}

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

@@ -1,124 +0,0 @@
-package com.cnbm.generator.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 功率等级 表
- * </p>
- *
- * @author codeGenerator
- * @since 2023-02-22
- */
-@Data
-@TableName("t_wo_power_level")
-@ApiModel(value = "WoPowerLevel对象", description = "功率等级 表")
-public class WoPowerLevel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("功率等级名称，（现场人员手动录入）")
-    private String powerClass;
-
-    @ApiModelProperty("pmpp_low,（现场人员手动录入）")
-    private Float pmppLow;
-
-    @ApiModelProperty("pmpp_high,（现场人员手动录入）")
-    private Float pmppHigh;
-
-    @ApiModelProperty("物料号,（现场人员手动录入）")
-    private String sapMaterialNum;
-
-    @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
-    private Integer lineBody;
-
-    @ApiModelProperty("lable_voc,（手动录入）")
-    private BigDecimal lableVoc;
-
-    @ApiModelProperty("lable_isc,（手动录入）")
-    private BigDecimal lableIsc;
-
-    @ApiModelProperty("lable_vmpp,（手动录入）")
-    private BigDecimal lableVmpp;
-
-    @ApiModelProperty("lable_impp,（手动录入）")
-    private BigDecimal lableImpp;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
-    @TableLogic
-    private Integer valid;
-
-    @ApiModelProperty("创建人")
-    private Long creatorId;
-
-    @ApiModelProperty("创建人姓名")
-    private String creatorName;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("更新人")
-    private Long updaterId;
-
-    @ApiModelProperty("更新人姓名")
-    private String updaterName;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty("版本号")
-    private Integer version;
-
-
-    public static final String ID = "id";
-
-    public static final String POWER_CLASS = "power_class";
-
-    public static final String PMPP_LOW = "pmpp_low";
-
-    public static final String PMPP_HIGH = "pmpp_high";
-
-    public static final String SAP_MATERIAL_NUM = "sap_material_num";
-
-    public static final String LINE_BODY = "line_body";
-
-    public static final String LABLE_VOC = "lable_voc";
-
-    public static final String LABLE_ISC = "lable_isc";
-
-    public static final String LABLE_VMPP = "lable_vmpp";
-
-    public static final String LABLE_IMPP = "lable_impp";
-
-    public static final String REMARK = "remark";
-
-    public static final String VALID = "valid";
-
-    public static final String CREATOR_ID = "creator_id";
-
-    public static final String CREATOR_NAME = "creator_name";
-
-    public static final String CREATE_TIME = "create_time";
-
-    public static final String UPDATER_ID = "updater_id";
-
-    public static final String UPDATER_NAME = "updater_name";
-
-    public static final String UPDATE_TIME = "update_time";
-
-    public static final String VERSION = "version";
-
-}

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

@@ -1,56 +0,0 @@
-package com.cnbm.generator.code.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-import java.util.Date;
-
-/**
- * 包装箱拆合箱历史表
- *
- * @author codeGenerator
- * @since  2023-02-16
- */
-@Data
-public class ChangePackagingBoxHistoryExcel {
-    @Excel(name = "ID")
-    private Long id;
-    @Excel(name = "基板ID或模组id")
-    private String substrateId;
-    @Excel(name = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
-    private Long sourceBoxNo;
-    @Excel(name = "源箱slot")
-    private Integer sourceSlot;
-    @Excel(name = "离开时间")
-    private LocalDateTime leaveTime;
-    @Excel(name = "目标箱box no, 关联t_wo_packaging_box.box_no 字段")
-    private Long targetBoxNo;
-    @Excel(name = "目标箱slot")
-    private Integer targetSlot;
-    @Excel(name = "进入时间")
-    private LocalDateTime inputTime;
-    @Excel(name = "等级")
-    private String grade;
-    @Excel(name = "类型，1为拆箱，2为合箱")
-    private Integer type;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
-    @Excel(name = "创建人")
-    private Long creatorId;
-    @Excel(name = "创建人姓名")
-    private String creatorName;
-    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
-    @Excel(name = "更新人")
-    private Long updaterId;
-    @Excel(name = "更新人姓名")
-    private String updaterName;
-    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
-    private Integer version;
-
-}

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

@@ -1,56 +0,0 @@
-package com.cnbm.generator.code.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-import java.util.Date;
-
-/**
- * 打印标签模板表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-@Data
-public class PrintModelExcel {
-    @Excel(name = "id")
-    private Long id;
-    @Excel(name = "编码")
-    private String code;
-    @Excel(name = "班组名称")
-    private String name;
-    @Excel(name = "启用状态:0 、停用，1、启用")
-    private Integer enabled;
-    @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 String remark;
-    @Excel(name = "类型，0：模组标签，1：等级标签")
-    private Integer type;
-    @Excel(name = "是否默认模板，0：否，1：是")
-    private Integer isDefault;
-    @Excel(name = "是否要预览，0：否，1：是")
-    private Integer isPreview;
-    @Excel(name = "模板内容")
-    private String content;
-    @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
-    private Integer lineBody;
-
-}

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

@@ -1,52 +0,0 @@
-package com.cnbm.generator.code.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-import java.util.Date;
-
-/**
- * 基板补偿功率 表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-@Data
-public class WoCompensationPowerExcel {
-    @Excel(name = "ID")
-    private Long id;
-    @Excel(name = "实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
-    private Float actlPmppLow;
-    @Excel(name = "实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
-    private Float actlPmppHigh;
-    @Excel(name = "计算公式")
-    private String formula;
-    @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
-    private Integer lineBody;
-    @Excel(name = "系数a,（手动录入）")
-    private Float coefficientA;
-    @Excel(name = "系数b,（手动录入）")
-    private Float coefficientB;
-    @Excel(name = "备注")
-    private String remark;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
-    @Excel(name = "创建人")
-    private Long creatorId;
-    @Excel(name = "创建人姓名")
-    private String creatorName;
-    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
-    @Excel(name = "更新人")
-    private Long updaterId;
-    @Excel(name = "更新人姓名")
-    private String updaterName;
-    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
-    private Integer version;
-
-}

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

@@ -1,80 +0,0 @@
-package com.cnbm.generator.code.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-import java.util.Date;
-
-/**
- * 包装箱表
- *
- * @author codeGenerator
- * @since  2023-02-23
- */
-@Data
-public class WoPackagingBoxExcel {
-    @Excel(name = "ID")
-    private Long id;
-    @Excel(name = "订单ID(舍弃)")
-    private Long orderId;
-    @Excel(name = "工单ID（舍弃啊）")
-    private Long workOrderId;
-    @Excel(name = "包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId")
-    private String boxNo;
-    @Excel(name = "功率，单位瓦（舍弃）")
-    private Integer power;
-    @Excel(name = "等级（舍弃）")
-    private Integer grade;
-    @Excel(name = "基板数量，每个包装箱最大20片（舍弃）")
-    private Integer substrateQuantity;
-    @Excel(name = "装箱完成时间，指的是包装完成时间")
-    private LocalDateTime packagingTime;
-    @Excel(name = "打印时间（最近一次打印时间）")
-    private LocalDateTime printTime;
-    @Excel(name = "打印状态：0、未打印，1、已打印")
-    private Integer printStatus;
-    @Excel(name = "报工状态：0、未报工，1、已报工(舍弃)")
-    private Integer completionReportingStatus;
-    @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 = "离开产线时间（舍弃）")
-    private LocalDateTime leaveLineTime;
-    @Excel(name = "下片端口id（舍弃）")
-    private String portId;
-    @Excel(name = "打印次数")
-    private Integer printCount;
-    @Excel(name = "功率等级")
-    private String powerLevel;
-    @Excel(name = "客户id（舍弃）")
-    private Long customerId;
-    @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的")
-    private String sapMaterial;
-    @Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
-    private Integer lineBody;
-    @Excel(name = "模式，1-手动模式；2-自动模式")
-    private Integer model;
-    @Excel(name = "是否到达包装台，1=到达；2=未达到")
-    private Integer isArrived;
-    @Excel(name = "订单号")
-    private String orderNum;
-
-}

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

@@ -1,120 +0,0 @@
-package com.cnbm.generator.code.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-import java.util.Date;
-
-/**
- * 包装箱基板关联表 ( 基板表 )
- *
- * @author codeGenerator
- * @since  2023-03-03
- */
-@Data
-public class WoPackagingBoxSubstrateExcel {
-    @Excel(name = "ID")
-    private Long id;
-    @Excel(name = "包装箱ID，BoxId")
-    private String packagingBoxId;
-    @Excel(name = "基板ID")
-    private String woSubstrateId;
-    @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 = "箱中位置")
-    private Integer slot;
-    @Excel(name = "进入时间")
-    private LocalDateTime inputTime;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
-    @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的")
-    private String sapMaterial;
-    @Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
-    private Integer lineBody;
-    @Excel(name = "功率等级")
-    private String powerLevel;
-    @Excel(name = "")
-    private LocalDateTime lastUpdateTime;
-    @Excel(name = "补偿后的功率，pmpp")
-    private Float pmpp;
-    @Excel(name = "订单名")
-    private String orderName;
-    @Excel(name = "")
-    private Long binclassFl1;
-    @Excel(name = "")
-    private Long binclassFl2;
-    @Excel(name = "")
-    private Float etaFl1;
-    @Excel(name = "")
-    private Float etaFl2;
-    @Excel(name = "")
-    private Float ffFl1;
-    @Excel(name = "")
-    private Float ffFl2;
-    @Excel(name = "")
-    private Float imppFl1;
-    @Excel(name = "")
-    private Float imppFl2;
-    @Excel(name = "")
-    private Float insolflashcontrolFl1;
-    @Excel(name = "")
-    private Float insolflashcontrolFl2;
-    @Excel(name = "")
-    private Float insolmppFl1;
-    @Excel(name = "")
-    private Float insolmppFl2;
-    @Excel(name = "")
-    private Float insolvocFl1;
-    @Excel(name = "")
-    private Float insolvocFl2;
-    @Excel(name = "")
-    private Float insolFl1;
-    @Excel(name = "")
-    private Float insolFl2;
-    @Excel(name = "")
-    private Float iscFl1;
-    @Excel(name = "")
-    private Float iscFl2;
-    @Excel(name = "")
-    private LocalDateTime measTimeFl1;
-    @Excel(name = "")
-    private LocalDateTime measTimeFl2;
-    @Excel(name = "")
-    private Float pmppFl1;
-    @Excel(name = "")
-    private Float pmppFl2;
-    @Excel(name = "")
-    private Float tcellFl1;
-    @Excel(name = "")
-    private Float tcellFl2;
-    @Excel(name = "")
-    private Float tmonicellFl1;
-    @Excel(name = "")
-    private Float tmonicellFl2;
-    @Excel(name = "")
-    private Float umppFl1;
-    @Excel(name = "")
-    private Float umppFl2;
-    @Excel(name = "")
-    private Float uocFl1;
-    @Excel(name = "")
-    private Float uocFl2;
-    @Excel(name = "真实PMPP")
-    private Float actualPmpp;
-
-}

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

@@ -1,58 +0,0 @@
-package com.cnbm.generator.code.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-import java.util.Date;
-
-/**
- * 包装箱打印历史表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-@Data
-public class WoPackagingPrintHistoryExcel {
-    @Excel(name = "ID")
-    private Long id;
-    @Excel(name = "包装箱编号，关联t_wo_packaging_box.box_no")
-    private Long boxNo;
-    @Excel(name = "打印时间")
-    private LocalDateTime printTime;
-    @Excel(name = "报工时间（舍弃）")
-    private LocalDateTime completionReportingTime;
-    @Excel(name = "打印状态：0、未打印，1、已打印")
-    private Integer printStatus;
-    @Excel(name = "报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）")
-    private Integer completionReportingStatus;
-    @Excel(name = "移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）")
-    private LocalDateTime leaveLineTime;
-    @Excel(name = "下片端口id（舍弃）")
-    private String portId;
-    @Excel(name = "打印次数")
-    private Integer printCount;
-    @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 = "备注")
-    private String remark;
-    @Excel(name = "模式，1-手动模式；2-自动模式")
-    private Integer model;
-
-}

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

@@ -1,58 +0,0 @@
-package com.cnbm.generator.code.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-import java.util.Date;
-
-/**
- * 功率等级 表
- *
- * @author codeGenerator
- * @since  2023-02-22
- */
-@Data
-public class WoPowerLevelExcel {
-    @Excel(name = "ID")
-    private Long id;
-    @Excel(name = "功率等级名称，（现场人员手动录入）")
-    private String powerClass;
-    @Excel(name = "pmpp_low,（现场人员手动录入）")
-    private Float pmppLow;
-    @Excel(name = "pmpp_high,（现场人员手动录入）")
-    private Float pmppHigh;
-    @Excel(name = "物料号,（现场人员手动录入）")
-    private String sapMaterialNum;
-    @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
-    private Integer lineBody;
-    @Excel(name = "lable_voc,（手动录入）")
-    private BigDecimal lableVoc;
-    @Excel(name = "lable_isc,（手动录入）")
-    private BigDecimal lableIsc;
-    @Excel(name = "lable_vmpp,（手动录入）")
-    private BigDecimal lableVmpp;
-    @Excel(name = "lable_impp,（手动录入）")
-    private BigDecimal lableImpp;
-    @Excel(name = "备注")
-    private String remark;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
-    @Excel(name = "创建人")
-    private Long creatorId;
-    @Excel(name = "创建人姓名")
-    private String creatorName;
-    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
-    @Excel(name = "更新人")
-    private Long updaterId;
-    @Excel(name = "更新人姓名")
-    private String updaterName;
-    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
-    private Integer version;
-
-}

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

@@ -1,16 +0,0 @@
-package com.cnbm.generator.code.mapper;
-
-import com.cnbm.common.dao.BaseDao;
-import com.cnbm.generator.code.entity.ChangePackagingBoxHistory;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 包装箱拆合箱历史表
- *
- * @author codeGenerator
- * @since 2023-02-16
- */
-@Mapper
-public interface ChangePackagingBoxHistoryMapper extends BaseDao<ChangePackagingBoxHistory> {
-	
-}

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

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.ChangePackagingBoxHistoryMapper">
-    <resultMap type="com.cnbm.generator.code.entity.ChangePackagingBoxHistory" id="ChangePackagingBoxHistoryMap">
-            <id column="ID" property="id" />
-            <id column="SUBSTRATE_ID" property="substrateId" />
-            <id column="SOURCE_BOX_NO" property="sourceBoxNo" />
-            <id column="SOURCE_SLOT" property="sourceSlot" />
-            <id column="LEAVE_TIME" property="leaveTime" />
-            <id column="TARGET_BOX_NO" property="targetBoxNo" />
-            <id column="TARGET_SLOT" property="targetSlot" />
-            <id column="INPUT_TIME" property="inputTime" />
-            <id column="GRADE" property="grade" />
-            <id column="TYPE" property="type" />
-            <id column="VALID" property="valid" />
-            <id column="CREATOR_ID" property="creatorId" />
-            <id column="CREATOR_NAME" property="creatorName" />
-            <id column="CREATE_TIME" property="createTime" />
-            <id column="UPDATER_ID" property="updaterId" />
-            <id column="UPDATER_NAME" property="updaterName" />
-            <id column="UPDATE_TIME" property="updateTime" />
-            <id column="VERSION" property="version" />
-    </resultMap>
-
-</mapper>

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

@@ -1,16 +0,0 @@
-package com.cnbm.generator.code.mapper;
-
-import com.cnbm.common.dao.BaseDao;
-import com.cnbm.generator.code.entity.PrintModel;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 打印标签模板表
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Mapper
-public interface PrintModelMapper extends BaseDao<PrintModel> {
-	
-}

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

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.PrintModelMapper">
-    <resultMap type="com.cnbm.generator.code.entity.PrintModel" id="PrintModelMap">
-            <id column="ID" property="id" />
-            <id column="CODE" property="code" />
-            <id column="NAME" property="name" />
-            <id column="ENABLED" property="enabled" />
-            <id column="CREATOR_ID" property="creatorId" />
-            <id column="CREATOR_NAME" property="creatorName" />
-            <id column="CREATE_TIME" property="createTime" />
-            <id column="UPDATER_ID" property="updaterId" />
-            <id column="UPDATER_NAME" property="updaterName" />
-            <id column="UPDATE_TIME" property="updateTime" />
-            <id column="VERSION" property="version" />
-            <id column="VALID" property="valid" />
-            <id column="REMARK" property="remark" />
-            <id column="TYPE" property="type" />
-            <id column="IS_DEFAULT" property="isDefault" />
-            <id column="IS_PREVIEW" property="isPreview" />
-            <id column="CONTENT" property="content" />
-            <id column="line_body" property="lineBody" />
-    </resultMap>
-
-</mapper>

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

@@ -1,16 +0,0 @@
-package com.cnbm.generator.code.mapper;
-
-import com.cnbm.common.dao.BaseDao;
-import com.cnbm.generator.code.entity.WoCompensationPower;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 基板补偿功率 表
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Mapper
-public interface WoCompensationPowerMapper extends BaseDao<WoCompensationPower> {
-	
-}

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.WoCompensationPowerMapper">
-    <resultMap type="com.cnbm.generator.code.entity.WoCompensationPower" id="WoCompensationPowerMap">
-            <id column="id" property="id" />
-            <id column="actl_pmpp_low" property="actlPmppLow" />
-            <id column="actl_pmpp_high" property="actlPmppHigh" />
-            <id column="formula" property="formula" />
-            <id column="line_body" property="lineBody" />
-            <id column="coefficient_a" property="coefficientA" />
-            <id column="coefficient_b" property="coefficientB" />
-            <id column="remark" property="remark" />
-            <id column="valid" property="valid" />
-            <id column="creator_id" property="creatorId" />
-            <id column="creator_name" property="creatorName" />
-            <id column="create_time" property="createTime" />
-            <id column="updater_id" property="updaterId" />
-            <id column="updater_name" property="updaterName" />
-            <id column="update_time" property="updateTime" />
-            <id column="version" property="version" />
-    </resultMap>
-
-</mapper>

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

@@ -1,16 +0,0 @@
-package com.cnbm.generator.code.mapper;
-
-import com.cnbm.common.dao.BaseDao;
-import com.cnbm.generator.code.entity.WoPackagingBox;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 包装箱表
- *
- * @author codeGenerator
- * @since 2023-02-23
- */
-@Mapper
-public interface WoPackagingBoxMapper extends BaseDao<WoPackagingBox> {
-	
-}

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

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.WoPackagingBoxMapper">
-    <resultMap type="com.cnbm.generator.code.entity.WoPackagingBox" id="WoPackagingBoxMap">
-            <id column="ID" property="id" />
-            <id column="ORDER_ID" property="orderId" />
-            <id column="WORK_ORDER_ID" property="workOrderId" />
-            <id column="BOX_NO" property="boxNo" />
-            <id column="POWER" property="power" />
-            <id column="GRADE" property="grade" />
-            <id column="SUBSTRATE_QUANTITY" property="substrateQuantity" />
-            <id column="PACKAGING_TIME" property="packagingTime" />
-            <id column="PRINT_TIME" property="printTime" />
-            <id column="PRINT_STATUS" property="printStatus" />
-            <id column="COMPLETION_REPORTING_STATUS" property="completionReportingStatus" />
-            <id column="REMARK" property="remark" />
-            <id column="VALID" property="valid" />
-            <id column="CREATOR_ID" property="creatorId" />
-            <id column="CREATOR_NAME" property="creatorName" />
-            <id column="CREATE_TIME" property="createTime" />
-            <id column="UPDATER_ID" property="updaterId" />
-            <id column="UPDATER_NAME" property="updaterName" />
-            <id column="UPDATE_TIME" property="updateTime" />
-            <id column="VERSION" property="version" />
-            <id column="LEAVE_LINE_TIME" property="leaveLineTime" />
-            <id column="PORT_ID" property="portId" />
-            <id column="PRINT_COUNT" property="printCount" />
-            <id column="POWER_LEVEL" property="powerLevel" />
-            <id column="CUSTOMER_ID" property="customerId" />
-            <id column="SAP_MATERIAL" property="sapMaterial" />
-            <id column="LINE_BODY" property="lineBody" />
-            <id column="model" property="model" />
-            <id column="is_arrived" property="isArrived" />
-            <id column="ORDER_NUM" property="orderNum" />
-    </resultMap>
-
-</mapper>

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

@@ -1,16 +0,0 @@
-package com.cnbm.generator.code.mapper;
-
-import com.cnbm.common.dao.BaseDao;
-import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 包装箱基板关联表 ( 基板表 )
- *
- * @author codeGenerator
- * @since 2023-03-03
- */
-@Mapper
-public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSubstrate> {
-	
-}

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

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.WoPackagingBoxSubstrateMapper">
-    <resultMap type="com.cnbm.generator.code.entity.WoPackagingBoxSubstrate" id="WoPackagingBoxSubstrateMap">
-            <id column="ID" property="id" />
-            <id column="PACKAGING_BOX_ID" property="packagingBoxId" />
-            <id column="WO_SUBSTRATE_ID" property="woSubstrateId" />
-            <id column="CREATOR_ID" property="creatorId" />
-            <id column="CREATOR_NAME" property="creatorName" />
-            <id column="CREATE_TIME" property="createTime" />
-            <id column="UPDATER_ID" property="updaterId" />
-            <id column="UPDATER_NAME" property="updaterName" />
-            <id column="UPDATE_TIME" property="updateTime" />
-            <id column="VERSION" property="version" />
-            <id column="SLOT" property="slot" />
-            <id column="INPUT_TIME" property="inputTime" />
-            <id column="VALID" property="valid" />
-            <id column="SAP_MATERIAL" property="sapMaterial" />
-            <id column="LINE_BODY" property="lineBody" />
-            <id column="POWER_LEVEL" property="powerLevel" />
-            <id column="LAST_UPDATE_TIME" property="lastUpdateTime" />
-            <id column="PMPP" property="pmpp" />
-            <id column="ORDER_NAME" property="orderName" />
-            <id column="BINCLASS_FL1" property="binclassFl1" />
-            <id column="BINCLASS_FL2" property="binclassFl2" />
-            <id column="ETA_FL1" property="etaFl1" />
-            <id column="ETA_FL2" property="etaFl2" />
-            <id column="FF_FL1" property="ffFl1" />
-            <id column="FF_FL2" property="ffFl2" />
-            <id column="IMPP_FL1" property="imppFl1" />
-            <id column="IMPP_FL2" property="imppFl2" />
-            <id column="InsolFlashControl_FL1" property="insolflashcontrolFl1" />
-            <id column="InsolFlashControl_FL2" property="insolflashcontrolFl2" />
-            <id column="InsolMPP_FL1" property="insolmppFl1" />
-            <id column="InsolMPP_FL2" property="insolmppFl2" />
-            <id column="InsolVoc_FL1" property="insolvocFl1" />
-            <id column="InsolVoc_FL2" property="insolvocFl2" />
-            <id column="Insol_FL1" property="insolFl1" />
-            <id column="Insol_FL2" property="insolFl2" />
-            <id column="ISC_FL1" property="iscFl1" />
-            <id column="ISC_FL2" property="iscFl2" />
-            <id column="MEAS_TIME_FL1" property="measTimeFl1" />
-            <id column="MEAS_TIME_FL2" property="measTimeFl2" />
-            <id column="PMPP_FL1" property="pmppFl1" />
-            <id column="PMPP_FL2" property="pmppFl2" />
-            <id column="Tcell_FL1" property="tcellFl1" />
-            <id column="Tcell_FL2" property="tcellFl2" />
-            <id column="Tmonicell_FL1" property="tmonicellFl1" />
-            <id column="Tmonicell_FL2" property="tmonicellFl2" />
-            <id column="UMPP_FL1" property="umppFl1" />
-            <id column="UMPP_FL2" property="umppFl2" />
-            <id column="UOC_FL1" property="uocFl1" />
-            <id column="UOC_FL2" property="uocFl2" />
-            <id column="ACTUAL_PMPP" property="actualPmpp" />
-    </resultMap>
-
-</mapper>

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

@@ -1,16 +0,0 @@
-package com.cnbm.generator.code.mapper;
-
-import com.cnbm.common.dao.BaseDao;
-import com.cnbm.generator.code.entity.WoPackagingPrintHistory;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 包装箱打印历史表
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Mapper
-public interface WoPackagingPrintHistoryMapper extends BaseDao<WoPackagingPrintHistory> {
-	
-}

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.WoPackagingPrintHistoryMapper">
-    <resultMap type="com.cnbm.generator.code.entity.WoPackagingPrintHistory" id="WoPackagingPrintHistoryMap">
-            <id column="ID" property="id" />
-            <id column="BOX_NO" property="boxNo" />
-            <id column="PRINT_TIME" property="printTime" />
-            <id column="COMPLETION_REPORTING_TIME" property="completionReportingTime" />
-            <id column="PRINT_STATUS" property="printStatus" />
-            <id column="COMPLETION_REPORTING_STATUS" property="completionReportingStatus" />
-            <id column="LEAVE_LINE_TIME" property="leaveLineTime" />
-            <id column="PORT_ID" property="portId" />
-            <id column="PRINT_COUNT" property="printCount" />
-            <id column="VALID" property="valid" />
-            <id column="CREATOR_ID" property="creatorId" />
-            <id column="CREATOR_NAME" property="creatorName" />
-            <id column="CREATE_TIME" property="createTime" />
-            <id column="UPDATER_ID" property="updaterId" />
-            <id column="UPDATER_NAME" property="updaterName" />
-            <id column="UPDATE_TIME" property="updateTime" />
-            <id column="VERSION" property="version" />
-            <id column="REMARK" property="remark" />
-            <id column="model" property="model" />
-    </resultMap>
-
-</mapper>

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

@@ -1,16 +0,0 @@
-package com.cnbm.generator.code.mapper;
-
-import com.cnbm.common.dao.BaseDao;
-import com.cnbm.generator.code.entity.WoPowerLevel;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 功率等级 表
- *
- * @author codeGenerator
- * @since 2023-02-22
- */
-@Mapper
-public interface WoPowerLevelMapper extends BaseDao<WoPowerLevel> {
-	
-}

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.WoPowerLevelMapper">
-    <resultMap type="com.cnbm.generator.code.entity.WoPowerLevel" id="WoPowerLevelMap">
-            <id column="id" property="id" />
-            <id column="power_class" property="powerClass" />
-            <id column="pmpp_low" property="pmppLow" />
-            <id column="pmpp_high" property="pmppHigh" />
-            <id column="sap_material_num" property="sapMaterialNum" />
-            <id column="line_body" property="lineBody" />
-            <id column="lable_voc" property="lableVoc" />
-            <id column="lable_isc" property="lableIsc" />
-            <id column="lable_vmpp" property="lableVmpp" />
-            <id column="lable_impp" property="lableImpp" />
-            <id column="remark" property="remark" />
-            <id column="valid" property="valid" />
-            <id column="creator_id" property="creatorId" />
-            <id column="creator_name" property="creatorName" />
-            <id column="create_time" property="createTime" />
-            <id column="updater_id" property="updaterId" />
-            <id column="updater_name" property="updaterName" />
-            <id column="update_time" property="updateTime" />
-            <id column="version" property="version" />
-    </resultMap>
-
-</mapper>

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

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1626059890161434625, 1067246875800000035, '包装箱拆合箱历史表', 'packing/changePackagingBoxHistory', 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 (1626059890161434626, 1626059890161434625, '查看', NULL, 'packing:changePackagingBoxHistory:page,packing:changePackagingBoxHistory: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 (1626059890161434627, 1626059890161434625, '新增', NULL, 'packing:changePackagingBoxHistory: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 (1626059890161434628, 1626059890161434625, '修改', NULL, 'packing:changePackagingBoxHistory: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 (1626059890161434629, 1626059890161434625, '删除', NULL, 'packing:changePackagingBoxHistory: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 (1626059890161434630, 1626059890161434625, '导出', NULL, 'packing:changePackagingBoxHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627506543435272194, 1067246875800000035, '打印标签模板表', 'packing/printModel', 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 (1627506543435272195, 1627506543435272194, '查看', NULL, 'packing:printModel:page,packing:printModel: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 (1627506543435272196, 1627506543435272194, '新增', NULL, 'packing:printModel: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 (1627506543435272197, 1627506543435272194, '修改', NULL, 'packing:printModel: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 (1627506543435272198, 1627506543435272194, '删除', NULL, 'packing:printModel: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 (1627506543435272199, 1627506543435272194, '导出', NULL, 'packing:printModel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627488175458189314, 1067246875800000035, '基板补偿功率 表', 'packing/woCompensationPower', 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 (1627488175458189315, 1627488175458189314, '查看', NULL, 'packing:woCompensationPower:page,packing:woCompensationPower: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 (1627488175458189316, 1627488175458189314, '新增', NULL, 'packing:woCompensationPower: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 (1627488175458189317, 1627488175458189314, '修改', NULL, 'packing:woCompensationPower: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 (1627488175458189318, 1627488175458189314, '删除', NULL, 'packing:woCompensationPower: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 (1627488175458189319, 1627488175458189314, '导出', NULL, 'packing:woCompensationPower:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1631549072342364161, 1067246875800000035, '包装箱基板关联表 ( 基板表 )', 'code/woPackagingBoxSubstrate', 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 (1631549072342364162, 1631549072342364161, '查看', NULL, 'code:woPackagingBoxSubstrate:page,code:woPackagingBoxSubstrate: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 (1631549072342364163, 1631549072342364161, '新增', NULL, 'code:woPackagingBoxSubstrate: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 (1631549072342364164, 1631549072342364161, '修改', NULL, 'code:woPackagingBoxSubstrate: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 (1631549072342364165, 1631549072342364161, '删除', NULL, 'code:woPackagingBoxSubstrate: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 (1631549072342364166, 1631549072342364161, '导出', NULL, 'code:woPackagingBoxSubstrate:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628589985438695426, 1067246875800000035, '包装箱表', 'code/woPackagingBox', 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 (1628589985438695427, 1628589985438695426, '查看', NULL, 'code:woPackagingBox:page,code:woPackagingBox: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 (1628589985438695428, 1628589985438695426, '新增', NULL, 'code:woPackagingBox: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 (1628589985438695429, 1628589985438695426, '修改', NULL, 'code:woPackagingBox: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 (1628589985438695430, 1628589985438695426, '删除', NULL, 'code:woPackagingBox: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 (1628589985438695431, 1628589985438695426, '导出', NULL, 'code:woPackagingBox:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627603723110080513, 1067246875800000035, '包装箱打印历史表', 'packing/woPackagingPrintHistory', 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 (1627603723110080514, 1627603723110080513, '查看', NULL, 'packing:woPackagingPrintHistory:page,packing:woPackagingPrintHistory: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 (1627603723110080515, 1627603723110080513, '新增', NULL, 'packing:woPackagingPrintHistory: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 (1627603723110080516, 1627603723110080513, '修改', NULL, 'packing:woPackagingPrintHistory: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 (1627603723110080517, 1627603723110080513, '删除', NULL, 'packing:woPackagingPrintHistory: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 (1627603723110080518, 1627603723110080513, '导出', NULL, 'packing:woPackagingPrintHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -1,7 +0,0 @@
--- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628374086450421761, 1067246875800000035, '功率等级 表', 'code/woPowerLevel', 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 (1628374086450421762, 1628374086450421761, '查看', NULL, 'code:woPowerLevel:page,code:woPowerLevel: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 (1628374086450421763, 1628374086450421761, '新增', NULL, 'code:woPowerLevel: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 (1628374086450421764, 1628374086450421761, '修改', NULL, 'code:woPowerLevel: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 (1628374086450421765, 1628374086450421761, '删除', NULL, 'code:woPowerLevel: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 (1628374086450421766, 1628374086450421761, '导出', NULL, 'code:woPowerLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

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

@@ -1,15 +0,0 @@
-package com.cnbm.generator.code.service;
-
-import com.cnbm.common.service.CrudService;
-import com.cnbm.generator.code.dto.ChangePackagingBoxHistoryDTO;
-import com.cnbm.generator.code.entity.ChangePackagingBoxHistory;
-
-/**
- * 包装箱拆合箱历史表
- *
- * @author codeGenerator
- * @since  2023-02-16
- */
-public interface ChangePackagingBoxHistoryServiceBiz extends CrudService<ChangePackagingBoxHistory, ChangePackagingBoxHistoryDTO> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.cnbm.generator.code.service;
-
-import com.cnbm.common.service.CrudService;
-import com.cnbm.generator.code.dto.PrintModelDTO;
-import com.cnbm.generator.code.entity.PrintModel;
-
-/**
- * 打印标签模板表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-public interface PrintModelServiceBiz extends CrudService<PrintModel, PrintModelDTO> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.cnbm.generator.code.service;
-
-import com.cnbm.common.service.CrudService;
-import com.cnbm.generator.code.dto.WoCompensationPowerDTO;
-import com.cnbm.generator.code.entity.WoCompensationPower;
-
-/**
- * 基板补偿功率 表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-public interface WoCompensationPowerServiceBiz extends CrudService<WoCompensationPower, WoCompensationPowerDTO> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.cnbm.generator.code.service;
-
-import com.cnbm.common.service.CrudService;
-import com.cnbm.generator.code.dto.WoPackagingBoxDTO;
-import com.cnbm.generator.code.entity.WoPackagingBox;
-
-/**
- * 包装箱表
- *
- * @author codeGenerator
- * @since  2023-02-23
- */
-public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, WoPackagingBoxDTO> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.cnbm.generator.code.service;
-
-import com.cnbm.common.service.CrudService;
-import com.cnbm.generator.code.dto.WoPackagingBoxSubstrateDTO;
-import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate;
-
-/**
- * 包装箱基板关联表 ( 基板表 )
- *
- * @author codeGenerator
- * @since  2023-03-03
- */
-public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.cnbm.generator.code.service;
-
-import com.cnbm.common.service.CrudService;
-import com.cnbm.generator.code.dto.WoPackagingPrintHistoryDTO;
-import com.cnbm.generator.code.entity.WoPackagingPrintHistory;
-
-/**
- * 包装箱打印历史表
- *
- * @author codeGenerator
- * @since  2023-02-20
- */
-public interface WoPackagingPrintHistoryServiceBiz extends CrudService<WoPackagingPrintHistory, WoPackagingPrintHistoryDTO> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.cnbm.generator.code.service;
-
-import com.cnbm.common.service.CrudService;
-import com.cnbm.generator.code.dto.WoPowerLevelDTO;
-import com.cnbm.generator.code.entity.WoPowerLevel;
-
-/**
- * 功率等级 表
- *
- * @author codeGenerator
- * @since  2023-02-22
- */
-public interface WoPowerLevelServiceBiz extends CrudService<WoPowerLevel, WoPowerLevelDTO> {
-
-}

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

@@ -1,34 +0,0 @@
-package com.cnbm.generator.code.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cnbm.common.service.impl.CrudServiceImpl;
-import com.cnbm.generator.code.dto.ChangePackagingBoxHistoryDTO;
-import com.cnbm.generator.code.mapper.ChangePackagingBoxHistoryMapper;
-import com.cnbm.generator.code.entity.ChangePackagingBoxHistory;
-import com.cnbm.generator.code.service.ChangePackagingBoxHistoryServiceBiz;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 包装箱拆合箱历史表
- *
- * @author codeGenerator
- * @since 2023-02-16
- */
-@Service
-public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<ChangePackagingBoxHistoryMapper, ChangePackagingBoxHistory, ChangePackagingBoxHistoryDTO> implements ChangePackagingBoxHistoryServiceBiz {
-
-    @Override
-    public QueryWrapper<ChangePackagingBoxHistory> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
-        QueryWrapper<ChangePackagingBoxHistory> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
-        return wrapper;
-    }
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.cnbm.generator.code.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cnbm.common.service.impl.CrudServiceImpl;
-import com.cnbm.generator.code.dto.PrintModelDTO;
-import com.cnbm.generator.code.mapper.PrintModelMapper;
-import com.cnbm.generator.code.entity.PrintModel;
-import com.cnbm.generator.code.service.PrintModelServiceBiz;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 打印标签模板表
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Service
-public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper, PrintModel, PrintModelDTO> implements PrintModelServiceBiz {
-
-    @Override
-    public QueryWrapper<PrintModel> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
-        QueryWrapper<PrintModel> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
-        return wrapper;
-    }
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.cnbm.generator.code.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cnbm.common.service.impl.CrudServiceImpl;
-import com.cnbm.generator.code.dto.WoCompensationPowerDTO;
-import com.cnbm.generator.code.mapper.WoCompensationPowerMapper;
-import com.cnbm.generator.code.entity.WoCompensationPower;
-import com.cnbm.generator.code.service.WoCompensationPowerServiceBiz;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 基板补偿功率 表
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Service
-public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompensationPowerMapper, WoCompensationPower, WoCompensationPowerDTO> implements WoCompensationPowerServiceBiz {
-
-    @Override
-    public QueryWrapper<WoCompensationPower> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
-        QueryWrapper<WoCompensationPower> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
-        return wrapper;
-    }
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.cnbm.generator.code.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cnbm.common.service.impl.CrudServiceImpl;
-import com.cnbm.generator.code.dto.WoPackagingBoxDTO;
-import com.cnbm.generator.code.mapper.WoPackagingBoxMapper;
-import com.cnbm.generator.code.entity.WoPackagingBox;
-import com.cnbm.generator.code.service.WoPackagingBoxServiceBiz;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 包装箱表
- *
- * @author codeGenerator
- * @since 2023-02-23
- */
-@Service
-public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBoxMapper, WoPackagingBox, WoPackagingBoxDTO> implements WoPackagingBoxServiceBiz {
-
-    @Override
-    public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
-        QueryWrapper<WoPackagingBox> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
-        return wrapper;
-    }
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.cnbm.generator.code.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cnbm.common.service.impl.CrudServiceImpl;
-import com.cnbm.generator.code.dto.WoPackagingBoxSubstrateDTO;
-import com.cnbm.generator.code.mapper.WoPackagingBoxSubstrateMapper;
-import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate;
-import com.cnbm.generator.code.service.WoPackagingBoxSubstrateServiceBiz;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 包装箱基板关联表 ( 基板表 )
- *
- * @author codeGenerator
- * @since 2023-03-03
- */
-@Service
-public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPackagingBoxSubstrateMapper, WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> implements WoPackagingBoxSubstrateServiceBiz {
-
-    @Override
-    public QueryWrapper<WoPackagingBoxSubstrate> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
-        QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
-        return wrapper;
-    }
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.cnbm.generator.code.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cnbm.common.service.impl.CrudServiceImpl;
-import com.cnbm.generator.code.dto.WoPackagingPrintHistoryDTO;
-import com.cnbm.generator.code.mapper.WoPackagingPrintHistoryMapper;
-import com.cnbm.generator.code.entity.WoPackagingPrintHistory;
-import com.cnbm.generator.code.service.WoPackagingPrintHistoryServiceBiz;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 包装箱打印历史表
- *
- * @author codeGenerator
- * @since 2023-02-20
- */
-@Service
-public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPackagingPrintHistoryMapper, WoPackagingPrintHistory, WoPackagingPrintHistoryDTO> implements WoPackagingPrintHistoryServiceBiz {
-
-    @Override
-    public QueryWrapper<WoPackagingPrintHistory> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
-        QueryWrapper<WoPackagingPrintHistory> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
-        return wrapper;
-    }
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.cnbm.generator.code.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cnbm.common.service.impl.CrudServiceImpl;
-import com.cnbm.generator.code.dto.WoPowerLevelDTO;
-import com.cnbm.generator.code.mapper.WoPowerLevelMapper;
-import com.cnbm.generator.code.entity.WoPowerLevel;
-import com.cnbm.generator.code.service.WoPowerLevelServiceBiz;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 功率等级 表
- *
- * @author codeGenerator
- * @since 2023-02-22
- */
-@Service
-public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapper, WoPowerLevel, WoPowerLevelDTO> implements WoPowerLevelServiceBiz {
-
-    @Override
-    public QueryWrapper<WoPowerLevel> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
-        QueryWrapper<WoPowerLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
-        return wrapper;
-    }
-
-
-}

ym-generator/src/main/java/com/cnbm/generator/config/DataConfig.java

@@ -10,7 +10,7 @@ import java.nio.file.Paths;
  * @Version 1.0
  */
 public class DataConfig {
-    public static final String url = "jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true";
+    public static final String url = "jdbc:mysql://mysql.picaiba.com:30307/ym_pass?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true";
     public static final String username = "root";
     public static final String password = "1qaz@WSX3edc$RFV";
 }

ym-packing/pom.xml

@@ -23,25 +23,5 @@
             <artifactId>ym-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.cnbm</groupId>
-            <artifactId>ym-s7</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.cnbm</groupId>
-            <artifactId>ym-dynamic-datasource</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.cnbm</groupId>
-            <artifactId>ym-admin</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java

@@ -1,495 +0,0 @@
-package com.cnbm.dispatch;
-
-import cn.hutool.core.date.DateUtil;
-import com.cnbm.dispatch.enums.kuka.step1.Step1Mes2PlcVar;
-import com.cnbm.dispatch.enums.kuka.step1.Step1Plc2MesVar;
-import com.cnbm.dispatch.enums.kuka.step2.Step2Mes2PlcVar;
-import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar;
-import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar;
-import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
-import com.cnbm.packing.dto.CamlineExtendArgDTO;
-import com.cnbm.packing.dto.CamlineSubIdDTO;
-import com.cnbm.packing.entity.WoPackagingBox;
-import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
-import com.cnbm.packing.entity.WoPowerLevel;
-import com.cnbm.packing.service.*;
-import com.cnbm.s7.s7connector.enmuc.S7Client;
-import com.cnbm.s7.s7connector.type.PlcVar;
-import io.swagger.models.auth.In;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.text.DecimalFormat;
-import java.text.Format;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Desc: ""
- * @Author: caixiang
- * @DATE: 2022/12/23 12:33
- */
-@Component
-@Order(value = 1)
-public class KukaJoinThread implements ApplicationRunner {
-    private static final Logger logger = LoggerFactory.getLogger(KukaJoinThread.class);
-
-    @Autowired
-    DynamicDataSourceService service;
-    @Autowired
-    WoPowerLevelServiceBiz levelServiceBiz;
-
-    @Autowired
-    WoCompensationPowerServiceBiz compensationPowerServiceBiz;
-
-    @Autowired
-    WoPackagingBoxSubstrateServiceBiz substrateServiceBiz;
-
-    @Autowired
-    WoPackagingBoxServiceBiz boxServiceBiz;
-
-    public KukaJoinThread(){
-        this.kukaStep1 = Executors.newScheduledThreadPool(1);
-        this.kukaStep2 = Executors.newScheduledThreadPool(1);
-        this.kukaStep3 = Executors.newScheduledThreadPool(1);
-    }
-
-    private ScheduledExecutorService kukaStep1;
-    private ScheduledExecutorService kukaStep2;
-    private ScheduledExecutorService kukaStep3;
-
-
-
-
-    /**
-     * return
-     *          成功： 返回相应的object对象
-     *          失败： 返回null
-     * */
-    private Object read(S7Client s7Client,Step1Plc2MesVar var) {
-        try {
-            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
-        }catch (Exception e){
-            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-    private void write(S7Client s7Client, Step1Mes2PlcVar var, Object newValue) {
-        if(var.getType().equals(PlcVar.STRING_Array)){
-            String[] s = (String[])newValue;
-            String[] ss = (String[])newValue;
-            if(s.length > var.getLength() ){
-                ss = new String[var.getLength()];
-                for(int i=0;i< var.getLength();i++){
-                    ss[i] = s[i];
-                }
-            }
-            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss);
-        }else {
-            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue);
-        }
-    }
-
-    private Object read(S7Client s7Client, Step2Plc2MesVar var) {
-        try {
-            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
-        }catch (Exception e){
-            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-    private void write(S7Client s7Client, Step2Mes2PlcVar var, Object newValue) {
-        if(var.getType().equals(PlcVar.STRING_Array)){
-            String[] s = (String[])newValue;
-            String[] ss = (String[])newValue;
-            if(s.length > var.getLength() ){
-                ss = new String[var.getLength()];
-                for(int i=0;i< var.getLength();i++){
-                    ss[i] = s[i];
-                }
-            }
-            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss);
-        }else {
-            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue);
-        }
-    }
-
-    private Object read(S7Client s7Client, Step3Plc2MesVar var) {
-        try {
-            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
-        }catch (Exception e){
-            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-    private void write(S7Client s7Client, Step3Mes2PlcVar var, Object newValue) {
-        if(var.getType().equals(PlcVar.STRING_Array)){
-            String[] s = (String[])newValue;
-            String[] ss = (String[])newValue;
-            if(s.length > var.getLength() ){
-                ss = new String[var.getLength()];
-                for(int i=0;i< var.getLength();i++){
-                    ss[i] = s[i];
-                }
-            }
-            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss);
-        }else {
-            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue);
-        }
-    }
-
-
-    public String getBoxId(String sapMaterial){
-        Integer todayBoxNum = service.getTodayBoxNum();
-        String nowTime = DateUtil.format(new Date(), "yyMMdd");
-
-        todayBoxNum+=500;
-        String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum);
-        return res;
-    }
-
-    public String removeKG(String str){
-        return str.substring(0,17);
-    }
-
-    public static void main(String[] args) {
-        Integer a = 102;
-        Format f1 = new DecimalFormat("000");
-        System.out.println(f1.format(a));
-    }
-    public String formateString(Integer a){
-        Format f1 = new DecimalFormat("000");
-        return f1.format(a);
-    }
-
-    @Override
-    public void run(ApplicationArguments args) throws Exception {
-
-//        kukaStep1.scheduleAtFixedRate(new Runnable() {
-//            @Override
-//            public void run() {
-//                try {
-//
-//                    //调度开始
-////                logger.info("");
-////                logger.info("=================  现在开始执行 过程一 任务   ==================");
-//                    Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
-//                    if(subArrived != 1){
-//                        logger.info("标签打印Event---  失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-//                    }
-//
-//                    //一. 从plc 中获取 subId 和 lineNum
-//                    String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
-//                    Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
-//                    //把基板ID字符串的空格去掉，因为plc中设置的20位，但实际基板ID就是17位，因为带空格去数据库查询 有问题的。
-//                    subId = removeKG(subId);
-//
-//                    //二. MES 业务
-//                    //===============           MES 业务 开始         =================
-//                    //1. 从comline数据库中获取 实际pmpp
-//                    float pmppBySubId = service.getPMPPBySubId(subId);
-//                    //2. 匹配和计算补偿功率
-//                    float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
-//                    //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
-//                    WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
-//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass()));
-//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc());
-//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
-//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
-//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
-//                    logger.info("标签打印Event--- 采集到 基板ID: "+subId+", 线边号："+lineNum+"，从camline 获取到实际pmpp"+pmppBySubId+",计算后 补偿功率："+actualPMPP+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp());
-//
-//
-//
-//                    //4. 把基板录到数据库
-//                    WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
-//                    woPackagingBoxSubstrate.setLineBody(lineNum);
-//                    woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
-//                    woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
-//                    woPackagingBoxSubstrate.setWoSubstrateId(subId);
-//                    woPackagingBoxSubstrate.setActualPmpp(pmppBySubId);
-//                    woPackagingBoxSubstrate.setCreateTime(LocalDateTime.now());
-//
-//
-//                    //5. 从camline那里获取可变字段
-//                    CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
-//                    logger.info("标签打印Event--- 基板ID: "+subId+", 从camline获取PID16~PID22 的实测数据 成功, 数据内容:"+extendArgFromCamline.toString());
-//                    woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
-//                    woPackagingBoxSubstrate.setPmpp(actualPMPP);
-//                    woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName());
-//                    woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1());
-//                    woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2());
-//                    woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1());
-//                    woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2());
-//                    woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1());
-//                    woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2());
-//                    woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1());
-//                    woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2());
-//                    woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1());
-//                    woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2());
-//                    woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1());
-//                    woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2());
-//                    woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1());
-//                    woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2());
-//                    woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1());
-//                    woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2());
-//                    woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1());
-//                    woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2());
-//                    woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1());
-//                    woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2());
-//                    woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1());
-//                    woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2());
-//                    woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
-//                    woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2());
-//                    woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1());
-//                    woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
-//                    woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1());
-//                    woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2());
-//                    woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
-//                    woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2());
-//
-//                    substrateServiceBiz.insert(woPackagingBoxSubstrate);
-//                    logger.info("标签打印Event--- 基板ID: "+subId+", 录入数据库成功");
-//                    //===============           MES 业务 结束         =================
-//
-//                    //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
-//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
-//                    logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为true 成功");
-//                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-//                    Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
-//                    if(subArrived2 != 1){
-//                        logger.info("标签打印Event--- 失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-//                    }
-//
-//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
-//                    logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为 false 成功, Event1 成功结束");
-//
-//                }catch (Throwable e){
-//                    logger.info("标签打印Event---  :"+e.getMessage());
-//                }
-//            }
-//        },1,1, TimeUnit.SECONDS);
-//
-//
-//        kukaStep2.scheduleAtFixedRate(new Runnable() {
-//            @Override
-//            public void run() {
-//                try {
-//
-//                    //调度开始
-//                    Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
-//                    if(shelfIsFull != 1){
-//                        logger.info("BOXID生成Event-------失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
-//                    }
-//
-//                    //一. 从plc 中获取 subIdList 和 lineNum
-//                    String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
-//                    Integer listSize = (Integer)read(S7Client.S7_KUKA,Step2Plc2MesVar.PackageNumberSet);
-//
-//                    //二. MES 业务
-//                    //===============           MES 业务 开始         =================
-//                    //1.MES 生成BoxId
-//                    if(subIdList.length<=0){
-//                        logger.info("BOXID生成Event-------失败"+" --- "+"从plc里面获取到的基板列表 为空");
-//                        throw new Exception("BOXID生成Event-------kuka机械手 取到了空箱");
-//                    }
-//                    //真实的基板ID 就是17位的，plc读取过来，有空格，要把后面3位空格去掉就行了。
-//                    for(int i=0;i<subIdList.length;i++){
-//                        subIdList[i] = removeKG(subIdList[i]);
-//                    }
-//                    logger.info("BOXID生成Event-------获取到基板列表："+ Arrays.toString(subIdList)+",基板数量:"+listSize);
-//
-//                    WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
-//                    //如果我们系统中找不到这块基板那么就去camline里面找
-//                    if(bySubId == null){
-//                        //todo
-//                        CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline(subIdList[0]);
-//                        bySubId = new WoPackagingBoxSubstrate();
-//                        bySubId.setPowerLevel(subIdByCamline.getPowerLevel());
-//                        bySubId.setSapMaterial(subIdByCamline.getSapMaterial());
-//                        bySubId.setLineBody(2);
-//                    }
-//
-//
-//                    String boxId = getBoxId(bySubId.getSapMaterial());
-//                    logger.info("BOXID生成Event-------mes 生成的boxId :"+ boxId);
-//                    //2. 依次update 基板表，把boxId 赋予这些基板
-//                    for(int i=0;i<listSize;i++){
-//                        substrateServiceBiz.updatePackagingBoxIdAndSlotByWoSubstrateId(boxId,(i+1),subIdList[i]);
-//                    }
-//                    //3.去camline数据库 查询此基板ID 对应的订单
-//                    String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
-//                    //4. box信息录入到box表
-//                    WoPackagingBox woPackagingBox = new WoPackagingBox();
-//                    woPackagingBox.setBoxNo(boxId);
-//                    woPackagingBox.setPackagingTime(LocalDateTime.now());
-//                    woPackagingBox.setPowerLevel(bySubId.getPowerLevel());
-//                    woPackagingBox.setLineBody(bySubId.getLineBody());
-//                    woPackagingBox.setSapMaterial(bySubId.getSapMaterial());
-//                    woPackagingBox.setOrderNum(orderNameBySubId);
-//                    //1-手动模式，2-自动模式
-//                    woPackagingBox.setModel(2);
-//                    woPackagingBox.setCreateTime(LocalDateTime.now());
-//                    boxServiceBiz.insert(woPackagingBox);
-//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"写入数据库成功");
-//                    //===============           MES 业务 结束         =================
-//
-//                    //三. 把生成的BoxId 告诉kuka
-//                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
-//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"传给PLC 成功");
-//
-//                    //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
-//                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
-//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为true 成功");
-//                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-//                    Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
-//                    if(subArrived2 != 1){
-//                        logger.info("BOXID生成Event-------失败"+" --- "+"步骤1.  MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-//                    }
-//                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
-//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为false 成功,Event2 成功结束");
-//                }catch (Throwable e){
-//                    logger.info("BOXID生成Event------- :" + e.getMessage());
-//                }
-//            }
-//        },1,1, TimeUnit.SECONDS);
-//
-//
-//        kukaStep3.scheduleAtFixedRate(new Runnable() {
-//            @Override
-//            public void run() {
-//                try {
-//
-//                    //调度开始
-//                    Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
-//                    if(shelfIsFull != 1){
-//                        logger.info("装箱单打印Event------失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
-//                    }
-//
-//                    //一. 从plc 中获取 subIdList 和 lineNum
-//                    String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId);
-//                    Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum);
-//                    logger.info("装箱单打印Event------到达站台的boxId :"+boxId);
-//
-//                    //二. MES 业务
-//                    //===============           MES 业务 开始         =================
-//                    //1. box信息录入到box表
-//                    boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
-//                    logger.info("装箱单打印Event------boxId :"+boxId+"更新数据库成功");
-//                    //===============           MES 业务 结束         =================
-//
-//
-//                    //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
-//                    write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
-//                    logger.info("装箱单打印Event------boxId :"+boxId+"， ShelfIsFullArrivedFinish置为true 成功");
-//                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-//                    Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
-//                    if(subArrived2 != 1){
-//                        logger.info("装箱单打印Event------失败"+" --- "+"步骤1.  MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
-//                    }
-//                    logger.info("装箱单打印Event------boxId :"+boxId+"， 监听到subArrived=false 成功");
-//                    write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
-//                    logger.info("装箱单打印Event------boxId :"+boxId+"， Even3 成功");
-//                }catch (Throwable e){
-//                    logger.info("装箱单打印Event------"+e.getMessage());
-//                }
-//
-//            }
-//        },1,1, TimeUnit.SECONDS);
-
-    }
-
-    /**
-     *
-     * arg:
-     *      Step1Plc2MesVar 参数类型
-     *      targetValue        目的值
-     * return:
-     *      2 s7 访问异常;
-     *      1 成功;
-     * */
-    private Integer waitingForTarget(Step1Plc2MesVar var, Boolean targetValue) {
-        Integer res = 0;
-        while (true){
-            try {
-                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
-                if(targetValue.equals(now)){
-                    res = 1;
-                    break;
-                }
-                Thread.sleep(200);
-            }catch (Exception e){
-                logger.info("S7 数据采集 异常。");
-                res = 2;
-                break;
-            }
-        }
-        return res;
-    }
-    /**
-     *
-     * arg:
-     *      Step2Plc2MesVar 参数类型
-     *      targetValue        目的值
-     * return:
-     *      2 s7 访问异常;
-     *      1 成功;
-     * */
-    private Integer waitingForTarget(Step2Plc2MesVar var, Boolean targetValue) {
-        Integer res = 0;
-        while (true){
-            try {
-                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
-                if(targetValue.equals(now)){
-                    res = 1;
-                    break;
-                }
-                Thread.sleep(200);
-            }catch (Exception e){
-                logger.info("S7 数据采集 异常。");
-                res = 2;
-                break;
-            }
-        }
-        return res;
-    }
-    /**
-     *
-     * arg:
-     *      Step3Plc2MesVar 参数类型
-     *      targetValue        目的值
-     * return:
-     *      2 s7 访问异常;
-     *      1 成功;
-     * */
-    private Integer waitingForTarget(Step3Plc2MesVar var, Boolean targetValue) {
-        Integer res = 0;
-        while (true){
-            try {
-                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
-                if(targetValue.equals(now)){
-                    res = 1;
-                    break;
-                }
-                Thread.sleep(200);
-            }catch (Exception e){
-                logger.info("S7 数据采集 异常。");
-                res = 2;
-                break;
-            }
-        }
-        return res;
-    }
-}

ym-packing/src/main/java/com/cnbm/dispatch/enums/CodeEnum.java

@@ -1,15 +0,0 @@
-package com.cnbm.dispatch.enums;
-
-/**
- * @Author: 蔡翔
- * @Date: 2019/10/14 10:07
- * @Version 1.0
- */
-public interface CodeEnum {
-    Integer getNamespace();
-    String getIdentity();
-    String getType();
-    String getName();
-    String getDesc();
-    void set(String name,Integer nameSpace,String identity);
-}

ym-packing/src/main/java/com/cnbm/dispatch/enums/kuka/step1/Step1Mes2PlcVar.java

@@ -1,93 +0,0 @@
-package com.cnbm.dispatch.enums.kuka.step1;
-
-import com.cnbm.s7.s7connector.api.DaveArea;
-import com.cnbm.s7.s7connector.type.PlcVar;
-
-/**
- * @Desc: ""
- * @Author: caixiang
- * @DATE: 2023/2/21 19:35
- */
-public enum Step1Mes2PlcVar {
-    SubArrivedFinish("SubArrivedFinish", PlcVar.BOOL,1, DaveArea.DB,2000,26,0),
-
-    dLable_Pnom("dLable_Pnom", PlcVar.DINT,1, DaveArea.DB,2000,28,0),
-    dLable_Voc("dLable_Voc", PlcVar.REAL,1, DaveArea.DB,2000,32,0),
-    dLable_Isc("dLable_Isc", PlcVar.REAL,1, DaveArea.DB,2000,36,0),
-    dLable_Vmpp("dLable_Vmpp", PlcVar.REAL,1, DaveArea.DB,2000,40,0),
-    dLable_Impp("dLable_Vmpp", PlcVar.REAL,1, DaveArea.DB,2000,44,0),
-
-
-
-    ;
-
-    private String name;
-    private DaveArea area;
-    private Integer areaNumber;
-    private Integer byteOffset;
-    private Integer bitOffset;
-    private PlcVar type;
-    //length = 1代表 非数组;;;       length > 1 代表数组  ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关
-    //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。
-    private Integer length;
-
-    //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度
-    private Integer strSize;
-
-    Step1Mes2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){
-        this.name = name;
-        this.type = type;
-        this.length = length;
-        this.area = area;
-        this.areaNumber = areaNumber;
-        this.byteOffset = byteOffset;
-        this.bitOffset = bitOffset;
-        this.strSize = 0;
-    }
-    Step1Mes2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){
-        this.name = name;
-        this.type = type;
-        this.length = length;
-        this.area = area;
-        this.areaNumber = areaNumber;
-        this.byteOffset = byteOffset;
-        this.bitOffset = bitOffset;
-        this.strSize = strSize;
-    }
-
-    public Integer getStrSize() {
-        return strSize;
-    }
-
-    public void setStrSize(Integer strSize) {
-        this.strSize = strSize;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public DaveArea getArea() {
-        return area;
-    }
-
-    public Integer getAreaNumber() {
-        return areaNumber;
-    }
-
-    public Integer getBitOffset() {
-        return bitOffset;
-    }
-
-    public Integer getByteOffset() {
-        return byteOffset;
-    }
-
-    public PlcVar getType() {
-        return type;
-    }
-
-    public Integer getLength() {
-        return length;
-    }
-}

ym-packing/src/main/java/com/cnbm/dispatch/enums/kuka/step1/Step1Plc2MesVar.java

@@ -1,89 +0,0 @@
-package com.cnbm.dispatch.enums.kuka.step1;
-
-import com.cnbm.s7.s7connector.api.DaveArea;
-import com.cnbm.s7.s7connector.type.PlcVar;
-
-/**
- * @Desc: ""
- * @Author: caixiang
- * @DATE: 2023/2/21 19:35
- */
-public enum Step1Plc2MesVar {
-
-    SubArrivedToMes("SubArrivedToMes", PlcVar.BOOL,1, DaveArea.DB,2000,0,0),
-    SubIdToMes("SubIdToMes",PlcVar.STRING,1,DaveArea.DB,2000,2,0,20),
-    LineNum("LineNum", PlcVar.UINT,1, DaveArea.DB,2000,24,0),
-
-
-    ;
-
-    private String name;
-    private DaveArea area;
-    private Integer areaNumber;
-    private Integer byteOffset;
-    private Integer bitOffset;
-    private PlcVar type;
-    //length = 1代表 非数组;;;       length > 1 代表数组  ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关
-    //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。
-    private Integer length;
-
-    //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度
-    private Integer strSize;
-
-    Step1Plc2MesVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){
-        this.name = name;
-        this.type = type;
-        this.length = length;
-        this.area = area;
-        this.areaNumber = areaNumber;
-        this.byteOffset = byteOffset;
-        this.bitOffset = bitOffset;
-        this.strSize = 0;
-    }
-    Step1Plc2MesVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){
-        this.name = name;
-        this.type = type;
-        this.length = length;
-        this.area = area;
-        this.areaNumber = areaNumber;
-        this.byteOffset = byteOffset;
-        this.bitOffset = bitOffset;
-        this.strSize = strSize;
-    }
-
-    public Integer getStrSize() {
-        return strSize;
-    }
-
-    public void setStrSize(Integer strSize) {
-        this.strSize = strSize;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public DaveArea getArea() {
-        return area;
-    }
-
-    public Integer getAreaNumber() {
-        return areaNumber;
-    }
-
-    public Integer getBitOffset() {
-        return bitOffset;
-    }
-
-    public Integer getByteOffset() {
-        return byteOffset;
-    }
-
-    public PlcVar getType() {
-        return type;
-    }
-
-    public Integer getLength() {
-        return length;
-    }
-}