1

dev-config/src/main/java/com/tykj/dev/config/MyWebMvcConfig.java

+package com.tykj.dev.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName MyWebMvcConfig.java
+ * @Description TODO
+ * @createTime 2020年08月09日 17:28:00
+ */
+@Configuration
+public class MyWebMvcConfig implements WebMvcConfigurer {
+    @Value("${file.path}")
+    private String path;
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // 将/static/**访问映射到classpath:/mystatic/
+        registry.addResourceHandler("/file/**").addResourceLocations("file:"+path);
+    }
+}

dev-device/device-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java

@@ -154,12 +154,13 @@ public class FileController {
 
         List<MultipartFile> multipartFiles = ((MultipartHttpServletRequest)request).getFiles("file");
         System.out.println("数据条数"+multipartFiles.size());
-
+        File file1 = new File(url+"print/");
+        if (!file1.exists()){
+            file1.mkdirs();
+        }
         String fileName = UUID.randomUUID().toString()+".pdf";
         File file = new File(url+"print/"+fileName);
-        if (file.exists()){
-            file.mkdirs();
-        }
+
         // 第一步：创建一个document对象。
         Document document = new Document();
         document.setMargins(0, 0, 0, 0);

dev-device/device-train/src/main/java/com/tykj/dev/device/train/entity/vo/signUpReturn.java

@@ -23,7 +23,7 @@ public class signUpReturn {
     @ApiModelProperty(value = "是否报名 0 报名 1否" ,name ="returns" )
     private Integer returns;
 
-    @ApiModelProperty(value = "job——id" ,name ="jobId" )
+    @ApiModelProperty(value = "job——id" ,name ="taskId" )
     private Integer taskId;
 
     @ApiModelProperty(value = "培训id" ,name ="trainThemeId" )

dev-device/device-user/src/main/java/com/tykj/dev/device/user/base/ret/UserTrainVo.java

@@ -62,14 +62,21 @@ public class UserTrainVo {
     /**
      * 用户单位
      */
-    @ApiModelProperty(value = "用户单位", name = "unitsId", example = "12321L")
+    @ApiModelProperty(value = "用户单位", name = "unitsName", example = "12321L")
     private String unitsName;
 
+    /**
+     * 用户单位id
+     */
+    @ApiModelProperty(value = "用户单位id", name = "unitsId", example = "12321L")
+    private Integer unitsId;
+
     /**
      * 培训状态 0.已培训 1.已过期 2.未培训 3.快过期
      */
     private Integer trainStatus;
 
+
     /**
      * 0 是 1 否
      */

dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/User.java

@@ -86,7 +86,7 @@ public class User {
     private String fax;
 
     /**
-     * 状态 默认0，1表示删除
+     * 状态 默认0、1表示冻结
      */
     @ApiModelProperty(value = "状态", name = "isDel", example = "12321L")
     private Integer isDel=0;

dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -226,7 +226,7 @@ public class UserServiceImpl implements UserService {
                 }else {
                     userTrainVo.setIsMustJoin(1);
                 }
-                userTrainVo.setUnitsName(units.getName());
+                userTrainVo.setUnitsName(unitsService.findById(user.getUnitsId()).getName());
                 list.add(userTrainVo);
              }
          );

dev-rfid/src/main/java/com/tykj/dev/rfid/timeTask/InventoryScheduled.java

@@ -31,7 +31,8 @@ import java.util.List;
 @Component
 public class InventoryScheduled {
 
-    private String cron = "0 0/1 * * * ? ";
+//    private String cron = "0 0/1 * * * ? ";
+    private String cron = "0 0 1 * * ?";
 
     private ThreadPoolTaskScheduler threadPoolTaskScheduler;
 

dev-union/pom.xml

@@ -62,6 +62,18 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.tykj.dev</groupId>
+            <artifactId>device-usereport</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.tykj.dev</groupId>
+                    <artifactId>union</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>com.tykj.dev</groupId>
             <artifactId>device-apply</artifactId>

dev-union/src/main/resources/application.properties

@@ -16,6 +16,6 @@ server.servlet.session.timeout=PT1H
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 file.path=/Users/zjm/code/
-preview.path=192.168.0.10:8087/file/
+preview.path=192.168.102.26:8087/file/