Merge branch 'test' of http://git.izouma.com/licailing/wenlvju into test

src/main/java/com/izouma/wenlvju/domain/TrainingInstitution.java

@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 @AllArgsConstructor
@@ -146,4 +147,6 @@ public class TrainingInstitution extends BaseEntity {
     private String remark;
 
     private boolean submit;
+
+    private LocalDateTime firstWrite;
 }

src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java

@@ -88,9 +88,9 @@ public class TrainingInstitutionService {
     }
 
     public TrainingInstitution byUscc(String name, String uscc) {
-        TrainingInstitution byUscc = trainingInstitutionRepo.findByUscc(uscc);
+        TrainingInstitution byUscc = trainingInstitutionRepo.findByUscc(uscc.trim());
         if (ObjectUtil.isNotNull(byUscc)) {
-            if (byUscc.getName().equals(name)) {
+            if (byUscc.getName().equals(name.trim())) {
                 return byUscc;
             }
         }

src/main/java/com/izouma/wenlvju/web/TrainingInstitutionController.java

@@ -1,5 +1,6 @@
 package com.izouma.wenlvju.web;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.izouma.wenlvju.domain.TrainingInstitution;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.dto.TrainingInstitutionDTO;
@@ -15,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -32,7 +34,11 @@ public class TrainingInstitutionController extends BaseController {
             TrainingInstitution orig = trainingInstitutionRepo.findById(record.getId())
                     .orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
+
             orig.setSubmit(true);
+            if (ObjectUtil.isNull(orig.getFirstWrite())) {
+                orig.setFirstWrite(LocalDateTime.now());
+            }
             return trainingInstitutionRepo.save(orig);
         }
         return trainingInstitutionRepo.save(record);

src/main/vue/src/views/TrainingInstitutionEdit.vue

@@ -12,8 +12,8 @@
             <el-form-item prop="name" label="企业名称">
                 <el-input v-model="formData.name"></el-input>
             </el-form-item>
-            <el-form-item prop="usscc" label="注册号">
-                <el-input v-model="formData.usscc"></el-input>
+            <el-form-item prop="uscc" label="注册号">
+                <el-input v-model="formData.uscc"></el-input>
             </el-form-item>
             <el-form-item prop="businessScope" label="经营范围">
                 <el-input type="textarea" v-model="formData.businessScope"></el-input>
@@ -88,7 +88,7 @@
                 <el-input-number type="number" v-model="formData.traineesPerYearNum"></el-input-number>
             </el-form-item>
             <el-form-item prop="examPoint" label="是否是艺术水平考级考点">
-                <el-input v-model="formData.examPoint"></el-input>
+                <!-- <el-input v-model="formData.examPoint"></el-input> -->
             </el-form-item>
             <el-form-item prop="gradingOrganization" label="艺术水平考级机构名称">
                 <el-input v-model="formData.gradingOrganization"></el-input>

src/test/java/com/izouma/wenlvju/service/sms/NjwlSmsServiceTest.java

@@ -15,7 +15,7 @@ public class NjwlSmsServiceTest extends ApplicationTests {
         String body = "尊敬的调研对象：\n" +
                 "您好，为贯彻落实国家、省、市关于“双减”工作相关文件精神，了解和掌握我市文化艺术类校外培训机构相关情况，市文旅局决定开展全市文化艺术类校外培训机构网上问卷调查，如从事文化艺术类校外培训，请登录：http://wljtest.izouma.com/h5/trainingInstitution，填写调查问卷，如不从事文化艺术类校外培训，请忽略本条信息，谢谢。\n";
         ;
-        njwlSmsService.sendSms("15150689190", body);
+        njwlSmsService.sendSms("19951988293", body);
         // {"expiryDate":"1623808467934","tokenKey":"1fb4796840d8a7b8d43e022e5a1f693c","data":{"phone":"19951988293","message":"test"},"appId":"189610","operationType":"ADD"}
     }
 

src/test/java/com/izouma/wenlvju/service/storage/AliStorageServiceTest.java

@@ -17,10 +17,22 @@ public class AliStorageServiceTest extends ApplicationTests {
 
     @Test
     public void rename() {
+//        String url = "https://wenlvju.oss-cn-hangzhou.aliyuncs.com/application/2021-08-30-17-24-14bssUaKnl.jpg";
+//        int i = url.indexOf("com/");
+//        System.out.println(url.substring(i + 4));
+//
+//        int j = url.indexOf("jpg");
+//        System.out.println(url.substring(i + 4, j));
         Rate wu = rateRepo.findById(12696L).orElseThrow(new BusinessException("wu"));
         wu.getPrivacyPolicy().forEach(img -> {
-            img.lastIndexOf("/");
+            int start = img.indexOf("com/") + 4;
+            String oldUrl = img.substring(start);
+            System.out.println("之前：" + oldUrl);
+//            int end = img.indexOf("jpg");
+            String newUrl = img + "jpg";
+            System.out.println("之后：" + newUrl);
+            aliStorageService.rename(oldUrl, newUrl);
+
         });
-//        aliStorageService.rename("application/2021-08-30-18-18-18DKdQtyCS.", "application/2021-08-30-18-18-18DKdQtyCS.jpg");
     }
 }