111

720yun_fd_manage/gis_application/src/main/resources/application-locSit.yml

@@ -6,7 +6,7 @@ logging:
         level: INFO
         maxHistory: 180
     file:
-        path: E:/log/${project.name}_log
+        path: /log/${project.name}_log
     level:
         com:
             gis: debug
@@ -22,7 +22,7 @@ oss:
 server:
     domain: ''
     file:
-        path: E:\data\${project.name}_data\
+        path: /data/${project.name}_data/
 spring:
     datasource:
         driver-class-name: com.mysql.cj.jdbc.Driver
@@ -70,7 +70,7 @@ spring:
         timeout: 3000ms
     servlet:
         multipart:
-            location: F:\test
+            location: /test
 tlog:
     enable-invoke-time-print: true
 forest:
@@ -105,4 +105,4 @@ mybatis-plus:
             logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
             table-underline: true
     mapper-locations: classpath*:mapper/**/*Mapper.xml
-    typeAliasesPackage: com.gis.**.domain
+    typeAliasesPackage: com.gis.**.domain

720yun_fd_manage/gis_common/pom.xml

@@ -137,6 +137,13 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
+        <!--mybatis-plus代码生成器-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
         <!--分页插件-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -183,4 +190,4 @@
     </dependencies>
 
 
-</project>
+</project>

720yun_fd_manage/gis_common/src/main/java/com/gis/common/generate/AutoGenerate.java

@@ -0,0 +1,98 @@
+package com.gis.common.generate;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.generator.FastAutoGenerator;
+import com.baomidou.mybatisplus.generator.config.OutputFile;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class AutoGenerate {
+
+
+    public static void main(String[] args) {
+
+        String path =System.getProperty("user.dir");
+
+        generate(path,"", getTables(new String[]{
+                "t_scene_cold_storage"
+        }));
+
+//        generate(path,"goods", getTables(new String[]{
+//                        "t_camera","t_camera_detail","t_camera_out","t_camera_space","t_camera_version",
+//                        "t_company","t_goods","t_goods_sku","t_cart","t_goods_spec",
+//                        "t_goods_spec_value","t_goods_spu_spec","t_sn_code"
+//        }));
+//
+//        generate(path,"order", getTables(new String[]{
+//                        "t_increment_order","t_invoice","t_order","t_order_item",
+//                        "t_pre_sale","t_space_sdk","t_trade_log","t_commerce_order","t_download_order","t_expansion_order"
+//        }));
+//        generate(path,"order", getTables(new String[]{
+//                        "t_virtual_order"
+//        }));
+//
+//        generate(path,"user", getTables(new String[]{
+//                        "t_user","t_user_increment","t_manager","t_province","t_increment_type","t_intercom_message","t_receiver_info"
+//        }));
+    }
+
+    public static List<String> getTables(String [] tableNames){
+        return new ArrayList<>(Arrays.asList(tableNames));
+    }
+
+
+    public static void  generate(String path,String moduleName,  List<String> tables){
+        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4",
+            "root","4Dage@4Dage#@168")
+                .globalConfig(builder -> {
+                    builder.author("")               //作者
+                            .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)
+                            //.enableSwagger()           //开启swagger
+                            .commentDate("yyyy-MM-dd")
+                            .dateType(DateType.ONLY_DATE)
+                            .fileOverride();            //开启覆盖之前生成的文件
+
+                })
+                .packageConfig(builder -> {
+                    builder.parent("com.fdkankan")
+                            .moduleName(moduleName)
+                            .entity("entity")
+                            .service("service")
+                            .serviceImpl("service.impl")
+                            .controller("controller")
+                            .mapper("mapper")
+                            .xml("test.mapper")
+                            .pathInfo(Collections.singletonMap(OutputFile.xml,path+"\\src\\main\\resources\\mapper\\"+moduleName));
+                })
+                .strategyConfig(builder -> {
+                    builder.addInclude(tables)
+                            .addTablePrefix("t_")
+
+                            .serviceBuilder()
+                            .formatServiceFileName("I%sService")
+                            .formatServiceImplFileName("%sServiceImpl")
+
+                            .entityBuilder()
+                            .enableLombok()
+                            .logicDeleteColumnName("rec_status")
+                            .enableTableFieldAnnotation()
+//                            .superClass(BaseEntity.class)
+
+                            .controllerBuilder()
+                            .formatFileName("%sController")
+                            .enableRestStyle()
+
+                            .mapperBuilder()
+                            .superClass(BaseMapper.class)
+                            .formatMapperFileName("I%sMapper")
+                            .enableMapperAnnotation()
+                            .formatXmlFileName("%sMapper");
+                })
+                // .templateEngine(new FreemarkerTemplateEngine()) // 使用Freemarker引擎模板，默认的是Velocity引擎模板
+                .execute();
+    }
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkBaseSettingDto.java

@@ -0,0 +1,13 @@
+package com.gis.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class WorkBaseSettingDto extends WorkIdDto{
+
+//    private
+
+
+
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkIdDto.java

@@ -0,0 +1,13 @@
+package com.gis.domain.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class WorkIdDto {
+
+    @NotBlank(message = "workId不能为空")
+    private String workId;
+
+}

720yun_fd_manage/gis_oss/src/main/java/com/gis/oss/util/QrCodeUtils.java

@@ -3,27 +3,17 @@ package com.gis.oss.util;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
 import cn.hutool.http.HttpUtil;
-import com.amazonaws.services.dynamodbv2.xspec.S;
 import com.gis.common.constant.ConfigConstant;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import lombok.extern.slf4j.Slf4j;
 import org.iherus.codegen.qrcode.SimpleQrcodeGenerator;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import sun.misc.BASE64Encoder;
 
-import javax.imageio.ImageIO;
-import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

720yun_fd_manage/gis_service/src/main/java/com/gis/tree/DirTreeUtil.java

@@ -2,7 +2,6 @@ package com.gis.tree;
 
 
 import com.gis.domain.entity.DirEntity;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 
 import java.util.ArrayList;
 import java.util.List;

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/TestController.java

@@ -329,26 +329,26 @@ public class TestController extends BaseController {
     }
 
 
-    /**
-     修复1.4.0版本somedata.json
-     * @return
-     */
-    @ApiOperation(value = "修复1.6.0版本somedata.json", notes = "修复1.4.0版本somedata.json")
-    @GetMapping("/fixSomeData16")
-    public Result fixSomeData16(String workId,String active) {
-        if (workId.equalsIgnoreCase("all")){
-            List<WorkEntity> all = workService.findAll();
-            for (WorkEntity workEntity : all) {
-                if (workEntity.getStatus()==1&&workEntity.getId().startsWith("WK")){
-                    workService.fixSomeData2(workEntity.getId(),active);
-                }
-
-            }
-        }else {
-            workService.fixSomeData2(workId,active);
-
-        }
-        return Result.success();
-    }
-
-}
+//    /**
+//     修复1.4.0版本somedata.json
+//     * @return
+//     */
+//    @ApiOperation(value = "修复1.6.0版本somedata.json", notes = "修复1.4.0版本somedata.json")
+//    @GetMapping("/fixSomeData16")
+//    public Result fixSomeData16(String workId,String active) {
+//        if (workId.equalsIgnoreCase("all")){
+//            List<WorkEntity> all = workService.findAll();
+//            for (WorkEntity workEntity : all) {
+//                if (workEntity.getStatus()==1&&workEntity.getId().startsWith("WK")){
+//                    workService.fixSomeData2(workEntity.getId(),active);
+//                }
+//
+//            }
+//        }else {
+//            workService.fixSomeData2(workId,active);
+//
+//        }
+//        return Result.success();
+//    }
+
+}

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkBaseSettingController.java

@@ -0,0 +1,21 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/work/edit/base")
+public class WorkBaseSettingController {
+
+    public Result saveBaseSetting(){
+
+
+
+
+
+        return  Result.success();
+    }
+
+
+}

720yun_fd_manage/pom.xml

@@ -267,6 +267,15 @@
                 <version>${mybatisPlus.version}</version>
             </dependency>
 
+            <!--mybatis-plus代码生成器-->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-generator</artifactId>
+                <scope>compile</scope>
+                <version>${mybatisPlus.version}</version>
+<!--                <version>3.5.1</version>-->
+            </dependency>
+
 
             <!--分页插件-->
             <dependency>
@@ -307,4 +316,4 @@
     </dependencyManagement>
 
 
-</project>
+</project>