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

@@ -4,17 +4,12 @@
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
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;

/**
@@ -33,7 +28,7 @@
    * @return
    * @throws VciBaseException
    */
   public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
   public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName) throws VciBaseException {
      BaseModel baseModel = object;
      try {
         baseModel.setOid(VciBaseUtil.getPk());
@@ -42,8 +37,6 @@
         baseModel.setLastModifyTime(new Date());
         baseModel.setTs(new Date());
         baseModel.setRevisionOid(VciBaseUtil.getPk());
         //用户id
         String userId = AuthUtil.getUserId().toString();
         baseModel.setBtmname(btmName);
         baseModel.setCreator(AuthUtil.getUserAccount());
         baseModel.setFirstR("1");
@@ -51,15 +44,20 @@
         baseModel.setLastR("1");
         baseModel.setLastV("1");
         baseModel.setRevisionSeq(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.getUserAccount());
         baseModel.setRevisionValue("1");
         baseModel.setRevisionRule("1");
         baseModel.setTenantId(AuthUtil.getTenantId());
      }catch (VciBaseException e){
         e.printStackTrace();
      }
@@ -78,9 +76,10 @@
      try {
         baseModel.setLastModifyTime(new Date());
         baseModel.setTs(new Date());
         //用户id
         String userId = AuthUtil.getUserId().toString();
         baseModel.setLastModifier(userId);
         // 用户id
         // String userId = AuthUtil.getUserId().toString();
         // 要求改成账号
         baseModel.setLastModifier(AuthUtil.getUserAccount());
      }catch (VciBaseException e){
         e.printStackTrace();
      }
@@ -105,7 +104,7 @@
            Object value=dataMap.get(key);
            newDataMap.put(key.toLowerCase(Locale.ROOT),value);
         }*/
      /*   dataMap.forEach((key,value)->{
         /*   dataMap.forEach((key,value)->{
            newDataMap.put(key.toLowerCase(Locale.ROOT),value);
         });*/
         //baseModel.setData((Map)newDataMap);
@@ -127,8 +126,8 @@
            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",""));
@@ -137,7 +136,6 @@
         baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
         Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
         if(revisionseq!=null){

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

@@ -149,8 +147,16 @@
         baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
         baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
         baseModel.setLastModifier(userId);

         baseModel.setLastModifier(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()));
         }
      }catch (VciBaseException e){
         e.printStackTrace();
      }