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

@@ -6,12 +6,14 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;

import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;

@@ -34,27 +36,35 @@
   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());
         baseModel.setTs(new Date());
         baseModel.setRevisionOid(VciBaseUtil.getPk());
         //用户id
         String userId = AuthUtil.getUserId().toString();
         // 用户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");
         baseModel.setLastV("1");
         baseModel.setRevisionSeq(1);
         baseModel.setOwner("1");
         // TODO:目前只有编码规则中有用到，后期需要去掉这段代码的话，就把他加在编码规则新增中去
         if(Func.isBlank(baseModel.getOwner())){
            // 设置所有者
            baseModel.setOwner(AuthUtil.getUserId().toString());
         }

         baseModel.setVersionSeq(1);
         baseModel.setVersionRule("0");
         baseModel.setVersionValue("1");
         baseModel.setRevisionOid(VciBaseUtil.getPk());
         baseModel.setLastModifier(userId);
         baseModel.setLastModifier(AuthUtil.getUser().getAccount());
         baseModel.setRevisionValue("1");
         baseModel.setRevisionRule("1");
         baseModel.setTenantId(AuthUtil.getTenantId());
      }catch (VciBaseException e){
         e.printStackTrace();
      }
@@ -73,9 +83,11 @@
      try {
         baseModel.setLastModifyTime(new Date());
         baseModel.setTs(new Date());
         //用户id
         String userId = AuthUtil.getUserId().toString();
         baseModel.setLastModifier(userId);
         // 用户id
         // String userId = AuthUtil.getUserId().toString();
         // 要求改成账号
         String account = AuthUtil.getUserAccount();
         baseModel.setLastModifier(account);
      }catch (VciBaseException e){
         e.printStackTrace();
      }
@@ -94,33 +106,58 @@
      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","");
         String createTime= createTimeObj.toString();
         baseModel.setCreateTime(chageStringToDate(createTime));
         if(createTimeObj!=null) {
            String createTime = createTimeObj.toString();
            baseModel.setCreateTime(chageStringToDate(createTime));
         }
         baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));

         Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
         String lastModifyTime= lastModifyTimeObj.toString();
         baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
         if(lastModifyTimeObj!=null) {
            String lastModifyTime = lastModifyTimeObj.toString();
            baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
         }
         Object tsObj=dataMap.getOrDefault("TS","");
         String ts= tsObj.toString();
         baseModel.setTs(chageStringToDate(ts));
         if(tsObj!=null) {
            String ts = tsObj.toString();
            baseModel.setTs(chageStringToDate(ts));
         }
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
         //用户id
         String userId = AuthUtil.getUserId().toString();
         //用户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",""));
         baseModel.setRevisionSeq(chageStringToInt(dataMap.getOrDefault("REVISIONSEQ","")));
         Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
         if(revisionseq!=null){

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

         baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
         baseModel.setVersionSeq(chageStringToInt(dataMap.getOrDefault("VERSIONSEQ","")));
         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(userId);
         baseModel.setLastModifier(AuthUtil.getUser().getAccount());

      }catch (VciBaseException e){
         e.printStackTrace();
      }