Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java

@@ -156,13 +156,13 @@
   }

   /**
    * 新增时填充默认值
    * 新增时填充默认值：多线程流中调用
    * @param object 继承了BaseModel的实体对象
    * @param <T>   返回值的类型
    * @return
    * @throws VciBaseException
    */
   public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase) throws VciBaseException {
   public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase, BladeUser user) throws VciBaseException {
      BaseModel baseModel = object;
      baseModel.getData().putAll(dataMap);
      try {
@@ -228,84 +228,6 @@
         baseModel.setDescription(dataMap.getOrDefault(isCase?"DESCRIPTION":"description",""));
         baseModel.setCopyFromVersion(dataMap.getOrDefault(isCase?"COPYFROMVERSION":"copyfromversion",""));
         Object secretgrade=dataMap.get(isCase?"SECRETGRADE":"secretgrade");
         if(secretgrade!=null){
            baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
         }
      }catch (VciBaseException e){
         e.printStackTrace();
         throw e;
      }
      return (T)baseModel;
   }

   /**
    * 新增时填充默认值：多线程流中调用
    * @param object 继承了BaseModel的实体对象
    * @param <T>   返回值的类型
    * @return
    * @throws VciBaseException
    */
   public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object, BladeUser user) throws VciBaseException {
      BaseModel baseModel = object;
      try {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         baseModel.setOid(dataMap.getOrDefault("OID",""));
         baseModel.setId(dataMap.getOrDefault("ID",""));
         Map<String,Object> newDataMap=new HashMap<>();
         /*for (String key:dataMap.keySet()){
            Object value=dataMap.get(key);
            newDataMap.put(key.toLowerCase(Locale.ROOT),value);
         }*/
         /*   dataMap.forEach((key,value)->{
            newDataMap.put(key.toLowerCase(Locale.ROOT),value);
         });*/
         //baseModel.setData((Map)newDataMap);
         Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
         if(createTimeObj!=null) {
            String createTime = createTimeObj.toString();
            baseModel.setCreateTime(chageStringToDate(createTime));
         }
         baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));

         Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
         if(lastModifyTimeObj!=null) {
            String lastModifyTime = lastModifyTimeObj.toString();
            baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
         }
         Object tsObj=dataMap.getOrDefault("TS","");
         if(tsObj!=null) {
            String ts = tsObj.toString();
            baseModel.setTs(chageStringToDate(ts));
         }
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
         //用户id ; 要求改成了账号
         // String userId = AuthUtil.getUserId().toString();
         baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
         baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
         baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
         baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
         baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
         baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
         Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
         if(revisionseq!=null){
            baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
         }

         baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
         Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
         if(versionseq!=null){
            baseModel.setVersionSeq(chageStringToInt(versionseq.toString()));
         }
         baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
         baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
         baseModel.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
         baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
         baseModel.setName(dataMap.getOrDefault("NAME",""));
         baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
         baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
         baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
         Object secretgrade=dataMap.get("SECRETGRADE");
         if(secretgrade!=null){
            baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
         }