ibizdev提交

config.xml

@@ -40,14 +40,14 @@
       mvn install
       cd ..
       mvn install
-      cd ps-app/ps-app-web
-      mvn clean package -Pprod
+      cd ps-boot
+      mvn clean package
       echo 'echo "$para1"' > apppasswd.sh
       chmod -R 777 *
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps-app-web.jar >>/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps_appps 应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps.jar root@172.16.102.61:/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps.jar >>/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps_apips 服务-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
       </command>
     </hudson.tasks.Shell>
   </builders>

ps-client/ps-client-im/src/main/java/com/ibiz/client/im/model/IMImpl.java

@@ -311,6 +311,14 @@ public class IMImpl implements IIM,Serializable{
     @JsonIgnore
     public boolean ngrqDirtyFlag;
     
+    /**
+     * PSID
+     */
+    public String pSId;
+
+    @JsonIgnore
+    public boolean pSIdDirtyFlag;
+    
     /**
      * 获取 [跨公司领导人员清单]
      */
@@ -1211,4 +1219,29 @@ public class IMImpl implements IIM,Serializable{
         return this.ngrqDirtyFlag ;
     }   
 
+    /**
+     * 获取 [PSID]
+     */
+    @JsonProperty("psid")
+    public String getPSId(){
+        return this.pSId ;
+    }
+
+    /**
+     * 设置 [PSID]
+     */
+    @JsonProperty("psid")
+    public void setPSId(String  pSId){
+        this.pSId = pSId ;
+        this.pSIdDirtyFlag = true ;
+    }
+
+     /**
+     * 获取 [PSID]脏标记
+     */
+    @JsonIgnore
+    public boolean getPSIdDirtyFlag(){
+        return this.pSIdDirtyFlag ;
+    }   
+
 }

ps-core/src/main/java/com/ibiz/core/client/model/IIM.java

@@ -517,4 +517,18 @@ public interface IIM {
      * 获取 [拟稿日期]脏标记
      */
     public boolean getNgrqDirtyFlag();
+    /**
+     * 获取 [PSID]
+     */
+    public void setPSId(String pSId);
+    
+    /**
+     * 设置 [PSID]
+     */
+    public String getPSId();
+
+    /**
+     * 获取 [PSID]脏标记
+     */
+    public boolean getPSIdDirtyFlag();
 }

ps-core/src/main/java/com/ibiz/core/module2/domain/IM.java

@@ -347,6 +347,15 @@ public class IM implements Serializable {
     @JSONField(serialize=false)
     private boolean ngrqDirtyFlag;
 
+    /**
+     * PSID
+     */
+    private String pSId;
+
+    @JsonIgnore
+    @JSONField(serialize=false)
+    private boolean pSIdDirtyFlag;
+
 
     /**
      * 获取 [跨公司领导人员清单]
@@ -1320,6 +1329,33 @@ public class IM implements Serializable {
     public boolean getNgrqDirtyFlag(){
         return this.ngrqDirtyFlag ;
     }
+    /**
+     * 获取 [PSID]
+     */
+    @JsonProperty("psid")
+    @JSONField(name="psid")
+    public String getPSId(){
+        return this.pSId ;
+    }
+
+    /**
+     * 设置 [PSID]
+     */
+    @JsonProperty("psid")
+    @JSONField(name="psid")
+    public void setPSId(String pSId){
+        this.pSId = pSId ;
+        this.pSIdDirtyFlag = true ;
+    }
+
+    /**
+     * 获取 [PSID]脏标记
+     */
+    @JsonIgnore
+    @JSONField(serialize=false)
+    public boolean getPSIdDirtyFlag(){
+        return this.pSIdDirtyFlag ;
+    }
 
 }
 

ps-core/src/main/java/com/ibiz/core/module2/service/impl/IMServiceImpl.java

@@ -200,6 +200,8 @@ public class IMServiceImpl implements IIMService {
             model.setZbbm(domain.getZbbm());
          if(domain.getNgrqDirtyFlag())
             model.setNgrq(domain.getNgrq());
+         if(domain.getPSIdDirtyFlag())
+            model.setPSId(domain.getPSId());
         return model ;
     }
 
@@ -282,6 +284,8 @@ public class IMServiceImpl implements IIMService {
             domain.setZbbm(model.getZbbm());
         if(model.getNgrqDirtyFlag())
             domain.setNgrq(model.getNgrq());
+        if(model.getPSIdDirtyFlag())
+            domain.setPSId(model.getPSId());
         return domain ;
     }
 

ps-core/src/main/java/com/ibiz/core/module2/valuerule/anno/im/IMPSIdDefault.java

+package com.ibiz.core.module2.valuerule.anno.im;
+
+import com.ibiz.core.module2.valuerule.validator.im.IMPSIdDefaultValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+/**
+ * 值规则注解
+ * 实体：IM
+ * 属性：PSId
+ * 值规则：Default
+ */
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Constraint(validatedBy = {IMPSIdDefaultValidator.class})
+public @interface IMPSIdDefault {
+    //是否默认检查
+    boolean flag() default true;
+
+    //值规则名称
+    String info() default "默认规则";
+
+    //值规则信息，如果为空，使用值规则名称。
+    String message() default "内容长度必须小于等于[100]";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMPSIdDefaultValidator.java

+package com.ibiz.core.module2.valuerule.validator.im;
+
+import lombok.extern.slf4j.Slf4j;
+import com.ibiz.util.valuerule.DefaultValueRule;
+import com.ibiz.util.valuerule.VRCondition;
+import com.ibiz.util.valuerule.condition.*;
+import com.ibiz.core.module2.valuerule.anno.im.IMPSIdDefault;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+
+
+/**
+ * 值规则注解解析类
+ * 实体：IM
+ * 属性：PSId
+ * 值规则：Default
+ * 值规则信息：内容长度必须小于等于[100]
+ */
+@Slf4j
+@Component("IMPSIdDefaultValidator")
+public class IMPSIdDefaultValidator implements ConstraintValidator<IMPSIdDefault, String>,Validator {
+    private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        boolean isValid = doValidate(value);
+        if(!isValid) {
+            context.disableDefaultConstraintViolation();
+            context.buildConstraintViolationWithTemplate(MESSAGE)
+                    .addConstraintViolation();
+        }
+        return doValidate(value);
+    }
+
+    @Override
+    public boolean supports(Class<?> aClass) {
+        return true;
+    }
+
+    @Override
+    public void validate(Object o, Errors errors) {
+        if( o!=null && supports(o.getClass())){
+            if (!doValidate((String) o)){
+                errors.reject(MESSAGE);
+            }
+        }
+    }
+
+    public boolean doValidate(String value) {
+        DefaultValueRule<String> valueRule = new DefaultValueRule<>("默认值规则",MESSAGE,"PSId",value)
+                //字符串长度，重复检查模式，重复值范围，基础值规则，是否递归检查。
+                .init(100,"NONE",null,null,false);
+        return valueRule.isValid();
+    }
+}
+

ps-core/src/main/resources/rules/PSCreateAndStartIMRule.drl

@@ -22,6 +22,7 @@ ruleflow-group "pscreateandstartimprepareparam1"
     pscreateandstartimim.setLd(pscreateandstartimdefault.getNgrid());
     pscreateandstartimim.setNgsh(pscreateandstartimdefault.getNgrid());
     pscreateandstartimim.setIMId(pscreateandstartimdefault.getPSId());
+    pscreateandstartimim.setPSId(pscreateandstartimdefault.getPSId());
     pscreateandstartimim.setIMName(pscreateandstartimdefault.getPSName());
     pscreateandstartimim.setSblb("10");
     pscreateandstartimim.setSblx("10");