Merge branch 'admin' into acs_v1.0.0

# Conflicts:
#	nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java

nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java

@@ -3,9 +3,11 @@ package org.nl;
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
 import com.alicp.jetcache.anno.config.EnableMethodCache;
+import org.dromara.dynamictp.core.spring.EnableDynamicTp;
 import org.mybatis.spring.annotation.MapperScan;
-import org.nl.common.annotation.Limit;
 import org.nl.config.SpringContextHolder;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -17,15 +19,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 开启审计功能 -> @EnableJpaAuditing
- * https://www.cnblogs.com/niceyoo/p/10908647.html
- * https://blog.csdn.net/qq_36850813/article/details/101194250
- *
  * @author ldjun
  * @date 2021/2/22 9:20:19
  */
 @EnableAsync
 @RestController
+@EnableDynamicTp
 @SpringBootApplication(exclude = {
         QuartzAutoConfiguration.class,
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
@@ -35,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableMethodCache(basePackages = "org.nl")
 @EnableCreateCacheAnnotation
 @MapperScan("org.nl.**.mapper")
-public class AppRun {
+public class AppRun implements ApplicationRunner {
 
     public static void main(String[] args) {
         SpringApplication.run(AppRun.class, args);
@@ -52,10 +51,14 @@ public class AppRun {
      * @return /
      */
     @GetMapping("/")
-    @Limit(period = 2, count = 1)
     @SaIgnore
     public String index() {
         return "Backend service started successfully";
     }
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        System.out.println("项目启动成功!");
+    }
 }
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java

@@ -1,7 +1,5 @@
 package org.nl.acs.address.rest;
 
-
-
 import lombok.RequiredArgsConstructor;
 import org.nl.acs.address.service.AddressService;
 import org.nl.acs.address.service.dto.AddressDto;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -6,20 +6,15 @@ import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.NDCAgvService;
 import org.nl.acs.common.base.CommonFinalParam;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver;
-import org.nl.acs.ext.wms.service.AcsToWmsService;
-import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.enums.InstructionStatusEnum;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
-import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.config.SpringContextHolder;
 import org.nl.system.service.lucene.LuceneExecuteLogService;
 import org.nl.system.service.param.ISysParamService;
-import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -79,17 +74,12 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
     @Override
     public void autoRun() throws IOException {
         System.out.println("NDCAgv链接开始");
-        ISysParamService ISysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class);
         InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class);
-        AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
         NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class);
         DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class);
-        DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class);
-        DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
         ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
         port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
 
-
         try {
             byte[] b = new byte[1024];
             s = new Socket(ip, port);

nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/rest/CustomPolicyController.java

@@ -1,7 +1,5 @@
 package org.nl.acs.custompolicy.rest;
 
-
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.custompolicy.server.CustomPolicyService;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/impl/LabelingTemplateServiceImpl.java

@@ -58,7 +58,6 @@ public class LabelingTemplateServiceImpl extends CommonServiceImpl<LabelingTempl
      * @return
      */
     @Override
-
     public LabelingTemplateDto findById(String id) {
         return ConvertUtil.convert(getById(id), LabelingTemplateDto.class);
     }

nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/rest/ProduceshiftorderController.java

@@ -60,12 +60,5 @@ public class ProduceshiftorderController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    /*
-    @Log("导出工单")
-    @GetMapping(value = "/download")
-    //@PreAuthorize("@el.check('produceshiftorder:list')")
-    public void download(HttpServletResponse response, ProduceshiftorderQueryParam query) throws IOException {
-        produceshiftorderService.download(produceshiftorderService.queryAll(query), response);
-    }*/
 
 }

nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/DataPermission.java

@@ -1,47 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.common.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * <p>
- *   用于判断是否过滤数据权限
- *   1、如果没有用到 @OneToOne 这种关联关系，只需要填写 fieldName [参考：DeptQueryCriteria.class]
- *   2、如果用到了 @OneToOne ，fieldName 和 joinName 都需要填写，拿UserQueryCriteria.class举例:
- *   应该是 @DataPermission(joinName = "dept", fieldName = "id")
- * </p>
- * @author Zheng Jie
- * @website https://el-admin.vip
- * @date 2020-05-07
- **/
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface DataPermission {
-
-    /**
-     * Entity 中的字段名称
-     */
-    String fieldName() default "";
-
-    /**
-     * Entity 中与部门关联的字段名称
-     */
-    String joinName() default "";
-}

nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/Query.java

@@ -1,88 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.common.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Zheng Jie
- * @date 2019-6-4 13:52:30
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Query {
-
-    // Dong ZhaoYang 2017/8/7 基本对象的属性名
-    String propName() default "";
-    // Dong ZhaoYang 2017/8/7 查询方式
-    Type type() default Type.EQUAL;
-
-    /**
-     * 连接查询的属性名，如User类中的dept
-     */
-    String joinName() default "";
-
-    /**
-     * 默认左连接
-     */
-    Join join() default Join.LEFT;
-
-    /**
-     * 多字段模糊搜索，仅支持String类型字段，多个用逗号隔开, 如@Query(blurry = "email,username")
-     */
-    String blurry() default "";
-
-    enum Type {
-        // jie 2019/6/4 相等
-        EQUAL
-        // Dong ZhaoYang 2017/8/7 大于等于
-        , GREATER_THAN
-        // Dong ZhaoYang 2017/8/7 小于等于
-        , LESS_THAN
-        // Dong ZhaoYang 2017/8/7 中模糊查询
-        , INNER_LIKE
-        // Dong ZhaoYang 2017/8/7 左模糊查询
-        , LEFT_LIKE
-        // Dong ZhaoYang 2017/8/7 右模糊查询
-        , RIGHT_LIKE
-        // Dong ZhaoYang 2017/8/7 小于
-        , LESS_THAN_NQ
-        // jie 2019/6/4 包含
-        , IN
-        // 不等于
-        ,NOT_EQUAL
-        // between
-        ,BETWEEN
-        // 不为空
-        ,NOT_NULL
-        // 为空
-        ,IS_NULL
-    }
-
-    /**
-     * @author Zheng Jie
-     * 适用于简单连接查询，复杂的请自定义该注解，或者使用sql查询
-     */
-    enum Join {
-        /** jie 2019-6-4 13:18:30 */
-        LEFT, RIGHT, INNER
-    }
-
-}
-

nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java

@@ -1,26 +0,0 @@
-package org.nl.start;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-/**
- * <p>
- * 随项目启动模块
- * </p>
- *
- * @author generator
- * @since 2023-11-16
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class Init implements ApplicationRunner {
-
-    @Override
-    public void run(ApplicationArguments args) throws Exception {
-        System.out.println("项目启动成功!");
-    }
-}