Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -457,7 +457,7 @@ public class AnnualInspectionController {
         try {
             //获取根目录
             String generateCode = DateUtils.generateCode();
-            String dir = StrUtil.join(File.separator, System.getProperty("user.dir"), "inspection", generateCode);
+            String dir = StrUtil.join(File.separator, ValuePool.SYSTEM_USER_DIR, "inspection", generateCode);
             String zip = dir + ".zip";
             zipFile = new File(zip);
             log.info("dir: {}", dir);

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -36,7 +36,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jms.core.JmsMessagingTemplate;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -814,11 +813,13 @@ public class EmergencyRepairController {
         File zipFile = null;
         try {
             //获取根目录
-            String root = System.getProperty("user.dir") + File.separator + "repair";
-            String templates = ResourceUtils.getURL("classpath:templates").getPath();
-            String missing = templates + File.separator + "missing.jpg";
+            String root = ValuePool.SYSTEM_USER_DIR + File.separator + "repair";
+            String missing = root + File.separator + "missing.jpg";
+
+//            String templates = ResourceUtils.getURL("classpath:templates").getPath();
+//            String missing = templates + File.separator + "missing.jpg";
             String generateCode = DateUtils.generateCode();
-            String dir = StrUtil.join(File.separator, System.getProperty("user.dir"), "repair", generateCode);
+            String dir = root + File.separator + generateCode;
             String zip = dir + ".zip";
             baseDir = new File(dir);
             zipFile = new File(zip);
@@ -893,7 +894,7 @@ public class EmergencyRepairController {
                 //生成急修单
                 String doc = imgDir + "1.急修单.doc";
                 log.info("生成急修单: {}", doc);
-                WordUtil.createWord(dataMap, templates, "repair.doc.ftl", doc);
+                WordUtil.createWord(dataMap, root, "repair.doc.ftl", doc);
             }
 
             //压缩文件夹

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/BigDecimalDeserializer.java

@@ -25,7 +25,7 @@ public class BigDecimalDeserializer extends StdScalarDeserializer<BigDecimal> {
     }
 
     @Override
-    public Object getEmptyValue(DeserializationContext ctxt) {
+    public Object getEmptyValue(DeserializationContext context) {
         return BigDecimal.ZERO;
     }
 

lift-common/src/main/java/cn.com.ty.lift.common/utils/ValuePool.java

@@ -306,4 +306,5 @@ public interface ValuePool {
     int    MAINTENANCE_INTERVAL             = 15;
     int    EVALUATE_SOURCE_MAINTENANCE      = 1;
     int    EVALUATE_SOURCE_EMERGENCY        = 2;
+    String SYSTEM_USER_DIR                  = System.getProperty("user.dir");
 }