Explorar o código

修改钉钉secret配置,导出修改

yusm hai 1 mes
pai
achega
f8a7554db5

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingTalkService.java

@@ -25,7 +25,7 @@ import java.util.Map;
 
 @Service
 public class DingTalkService {
-    
+    private static final Logger log = LoggerFactory.getLogger(DingTalkService.class);
     private final DingTalkConfig dingTalkConfig;
     private final RestTemplate restTemplate;
     
@@ -177,6 +177,7 @@ public class DingTalkService {
      */
     private String generateSignature(String timestamp) {
         try {
+            log.info("dingTalkConfig.getAppSecret()==>"+dingTalkConfig.getAppSecret());
             String stringToSign = timestamp + "\n" + dingTalkConfig.getAppSecret();
             Mac mac = Mac.getInstance("HmacSHA256");
             mac.init(new SecretKeySpec(dingTalkConfig.getAppSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256"));

+ 9 - 9
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceMonthlyWorktimeServiceImpl.java

@@ -216,13 +216,13 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                     setFmwTime(fmwDetail, report);
                 } else {
                     FmwDetail fmwDetail = new FmwDetail();
-                    fmwDetail.setComposeTime(0.0);
-                    fmwDetail.setRepairTime(0.0);
-                    fmwDetail.setDebugTime(0.0);
-                    fmwDetail.setWaitingTime(0.0);
-                    fmwDetail.setAssistTime(0.0);
-                    fmwDetail.setBustripTime(0.0);
-                    fmwDetail.setCleanTime(0.0);
+                    fmwDetail.setComposeTime(0.00);
+                    fmwDetail.setRepairTime(0.00);
+                    fmwDetail.setDebugTime(0.00);
+                    fmwDetail.setWaitingTime(0.00);
+                    fmwDetail.setAssistTime(0.00);
+                    fmwDetail.setBustripTime(0.00);
+                    fmwDetail.setCleanTime(0.00);
 
                     fmwDetail.setFmwId(financeMonthlyWorktime.getId());
                     fmwDetail.setProjectId(report.getProjectId());
@@ -510,7 +510,7 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                 double v1 = fmwDetail.getCleanTime() == null ? 0 : fmwDetail.getCleanTime();
                 double v2 = fmwDetail.getBustripTime() == null ? 0 : fmwDetail.getBustripTime();
                 double sum = v1 + v2;
-                DecimalFormat df = new DecimalFormat("#.#");
+                DecimalFormat df = new DecimalFormat("#.##");
                 double roundedSum = Double.parseDouble(df.format(sum));
                 cell8.setCellValue(roundedSum);
                 cell8.setCellStyle(dataStyle);
@@ -576,7 +576,7 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
         style.setBorderRight(BorderStyle.THIN);
         style.setAlignment(HorizontalAlignment.CENTER);
         DataFormat format = workbook.createDataFormat();
-        style.setDataFormat(format.getFormat("0.0"));
+        style.setDataFormat(format.getFormat("0.00"));
         return style;
     }
 }

+ 3 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -181,3 +181,6 @@ sftp:
   user: root
   password: Huoshi@2022
 
+dingtalk:
+  appSecret: o-TWFLkFe8YbJsa_025JOj_JEWydP5GR3eigt1Yn1rtx5dTcryTJiSA6KEih3Bi4
+