fetch:UUID修改

adc-da-slrs/pom.xml

@@ -11,12 +11,7 @@
 
     <artifactId>adc-da-slrs</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>com.adc</groupId>
-            <artifactId>adc-da-search</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.adc</groupId>
             <artifactId>adc-da-base</artifactId>
@@ -41,17 +36,7 @@
             <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.adc</groupId>
-            <artifactId>adc-da-util</artifactId>
-            <version>2.2.41</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk14</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
 
         <!-- poi -->
         <dependency>

adc-da-slrs/src/main/java/com/adc/da/mq/service/CreateMQService.java

@@ -2,8 +2,8 @@ package com.adc.da.mq.service;
 
 import com.adc.da.common.ConvertMqEO;
 import com.adc.da.mq.dao.OtConvertEODao;
-import com.adc.da.util.utils.StringUtils;
-import com.adc.da.util.utils.UUID;
+import com.adc.da.util.UUIDUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -27,7 +27,7 @@ public class CreateMQService {
      * @return int
      **/
     public void sendMQ(ConvertMqEO convert) throws Exception{
-        String otId = UUID.randomUUID(20);
+        String otId = UUIDUtils.randomUUID20();
         //向OT_CONVERT_EO表中添加/修改数据
         //判断用户是初次发送还是重新发送,初次将添加到数据库，重新发送将修改原数据信息
         convert.setMqState(0);
@@ -62,7 +62,7 @@ public class CreateMQService {
             //otId在转换表中数据ID
             convertInfo.put("otId", otId);
             //在stand_file等资源与文件关联表中转换成功的pdf数据ID
-            convertInfo.put("standFilePdfId", UUID.randomUUID(20));
+            convertInfo.put("standFilePdfId", UUIDUtils.randomUUID20());
             convertInfo.put("againNum",0);
         } else {
             convertInfo.put("otId", convert.getId());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java

@@ -6,7 +6,9 @@ import com.adc.da.http.Result;
 import com.adc.da.slrs.sarRole.service.ITsRoleService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sarRole.entity.TsRole;
 import io.swagger.annotations.Api;
@@ -43,4 +45,10 @@ public class TsRoleController extends BaseController<TsRole> {
         List<TsRole> tsRoles=tsRoleService.getByName(name);
         return Result.success(tsRoles);
     }
+
+    @ApiOperation("新增角色")
+    @PostMapping
+    public ResponseMessage<List<TsRole>> addRole(@Validated(TsRole.insert.class) TsRole tsRole){
+        return null;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java

@@ -18,6 +18,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 
@@ -31,6 +33,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Accessors(chain = true)
 @ApiModel(value="TsRole对象", description="")
 public class TsRole extends BaseEntity {
+    public interface insert{
+    }
 
     private static final long serialVersionUID = 1L;
 
@@ -38,6 +42,7 @@ public class TsRole extends BaseEntity {
     @TableId("ID")
     private String id;
 
+    @NotNull(message = "name不能为空",groups = {insert.class})
     @ApiModelProperty(value = "角色名称")
     @TableField("NAME")
     private String name;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -51,13 +51,6 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.util.PDFTextStripper;
-import org.apache.pdfbox.util.PDFTextStripperByArea;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;