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

@@ -13,6 +13,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;

@@ -35,7 +36,7 @@
   public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
      BaseModel baseModel = object;
      try {
         baseModel.setOid(VciBaseUtil.getPk().toUpperCase());
         baseModel.setOid(VciBaseUtil.getPk());
         baseModel.setCreateTime(new Date());
         baseModel.setNameOid(VciBaseUtil.getPk());
         baseModel.setLastModifyTime(new Date());
@@ -44,7 +45,7 @@
         //用户id
         String userId = AuthUtil.getUserId().toString();
         baseModel.setBtmname(btmName);
         baseModel.setCreator(userId);
         baseModel.setCreator(AuthUtil.getUser().getAccount());
         baseModel.setFirstR("1");
         baseModel.setFirstV("1");
         baseModel.setLastR("1");
@@ -99,7 +100,15 @@
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         baseModel.setOid(dataMap.getOrDefault("OID",""));
         baseModel.setId(dataMap.getOrDefault("ID",""));
         baseModel.setData(dataMap);;
         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();
@@ -128,15 +137,14 @@
         baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
         Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
         if(revisionseq!=null){
            BigDecimal b=(BigDecimal)revisionseq;
            baseModel.setRevisionSeq(chageStringToInt(b.toString()));

            baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
         }

         baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
         Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
         if(versionseq!=null){
            BigDecimal b=(BigDecimal)versionseq;
            baseModel.setVersionSeq(chageStringToInt(b.toString()));
            baseModel.setVersionSeq(chageStringToInt(versionseq.toString()));
         }
         baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
         baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));