Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java

@@ -67,4 +67,8 @@
     * çˆ¶èŠ‚点id
     */
    private String plActionCls;
    /**
     * å›¾æ ‡
     */
    private String plImage;
}

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@

package com.vci.pagemodel;


import lombok.Data;

import java.io.Serializable;

/**
 * æ“ä½œç±»åž‹å±žæ€§
 */
@Data
public class OperateVO implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    private String name;// åç§°
    private String identify;// æ ‡è¯†
    private String alias;//别名
    private String desc;// æè¿°
    private long seq;//顺序
    private String source;//图标
}

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java

@@ -8,6 +8,7 @@
import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightParamDTO;
import com.vci.dto.RoleRightParamDTOS;
import com.vci.pagemodel.OperateVO;
import com.vci.web.service.ISmFunctionQueryService;
import com.vci.web.service.SmHMSysModConfigServiceI;
import com.vci.pagemodel.AppConfigDetailInfoVO;
@@ -253,13 +254,13 @@

    /**
     * æ·»åŠ æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    @PostMapping("/addOperationType")
    public BaseResult addOperationType(@RequestBody OperateInfo operateInfo) {
    public BaseResult addOperationType(@RequestBody OperateVO operateVO) {
        try {
            return BaseResult.success(hmSysModConfigService.addOperationType(operateInfo),"添加操作类型成功");
            return BaseResult.success(hmSysModConfigService.addOperationType(operateVO),"添加操作类型成功");
        }catch (Exception e){
            e.printStackTrace();
            String errorMsg = "添加操作类型时出现错误，原因："+ VciBaseUtil.getExceptionMessage(e);
@@ -270,13 +271,13 @@

    /**
     * ä¿®æ”¹æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    @PutMapping("/updateOperationType")
    public BaseResult updateOperationType(@RequestBody OperateInfo operateInfo) {
    public BaseResult updateOperationType(@RequestBody OperateVO operateVO) {
        try {
            return BaseResult.success(hmSysModConfigService.updateOperationType(operateInfo),"修改操作类型成功");
            return BaseResult.success(hmSysModConfigService.updateOperationType(operateVO),"修改操作类型成功");
        }catch (Exception e){
            e.printStackTrace();
            String errorMsg = "修改操作类型时出现错误，原因："+ VciBaseUtil.getExceptionMessage(e);

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java

@@ -5,6 +5,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
import com.vci.pagemodel.OperateVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;

@@ -59,14 +60,14 @@
     * å¢žåŠ æ“ä½œç±»åž‹
     * @return
     */
    OperateInfo addOperationType(OperateInfo operateInfo);
    OperateInfo addOperationType(OperateVO operateVO);

    /**
     * ä¿®æ”¹æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException;
    OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException;

    /**
     * åˆ é™¤æ“ä½œç±»åž‹

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java

@@ -241,6 +241,7 @@
        plAction.plModifyUser = WebUtil.getCurrentUserId();
        plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
        plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
        plAction.plImage = StringUtils.defaultString(dto.getPlImage());
        boolean b = platformClientUtil.getUIService().savePLAction(plAction);
        if(!b){
            throw new PLException("500", new String[]{"保存失败！！"});
@@ -274,6 +275,7 @@
        plAction.plModifyUser = WebUtil.getCurrentUserId();
        plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
        plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
        plAction.plImage = StringUtils.defaultString(dto.getPlImage());
        boolean b = platformClientUtil.getUIService().updatePLAction(plAction);
        if(!b){
            throw new PLException("500", new String[]{"修改失败！！"});
@@ -299,6 +301,7 @@
        plAction.plModifyUser = WebUtil.getCurrentUserId();
        plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
        plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
        plAction.plImage = StringUtils.defaultString(dto.getPlImage());
        boolean b = platformClientUtil.getUIService().deletePLAction(plAction);
        if(!b){
            throw new PLException("500", new String[]{"删除失败！！"});

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java

@@ -575,6 +575,7 @@
                    menuVO.setSort((int) operateInfo.seq);
                    menuVO.setModeType("operateObject");
                    menuVO.setHasChildren(false);
                    menuVO.setSource(operateInfo.image);
                    menuVOList.add(menuVO);
                }
            }catch (PLException e) {

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java

@@ -7,6 +7,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
import com.vci.pagemodel.OperateVO;
import com.vci.starter.poi.bo.SheetDataSet;
import com.vci.starter.poi.bo.SheetRowData;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -25,6 +26,7 @@
import com.vci.web.util.PlatformClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -116,6 +118,9 @@
        VciBaseUtil.alertNotNull(menuVO,"修改的模块对象");
        try {
            String res = "";
            if(!menuVO.getAlias().matches("[a-z A-Z \\p{Punct}+]*")){
                throw new VciBaseException("注意：属性名只能为英文字母!");
            }
            //更新数据库
            res = foDelegate.updateMod(menuVO);
            /**
@@ -224,12 +229,30 @@
    }

    /**
     * æ“ä½œå¯¹è±¡å¤åˆ¶
     * @param operateVO æ“ä½œä¼ è¾“对象
     * @param operateInfo æ“ä½œä¿¡æ¯
     */
    private void copyOperationProperties(OperateVO operateVO, OperateInfo operateInfo){
        operateInfo.id = operateVO.getId();
        operateInfo.name = operateVO.getName();
        operateInfo.alias = operateVO.getAlias();
        operateInfo.image = operateVO.getSource();
        operateInfo.desc = operateVO.getDesc();
        operateInfo.identify = operateVO.getIdentify();
        operateInfo.seq = operateVO.getSeq();
    }

    /**
     * å¢žåŠ æ“ä½œç±»åž‹
     * @return
     */
    @Override
    public OperateInfo addOperationType(OperateInfo operateInfo) throws VciBaseException {
    public OperateInfo addOperationType(OperateVO operateVO) throws VciBaseException {
        try {
            OperateInfo operateInfo = new OperateInfo();
            copyOperationProperties(operateVO,operateInfo);
            operateInfo.image = operateVO.getSource();
            //校验
            this.checkItem(operateInfo);
            String s = foDelegate.saveOperate(operateInfo);
@@ -253,13 +276,16 @@

    /**
     * ä¿®æ”¹æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    @Override
    public OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException {
    public OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException {
        try {
            OperateInfo operateInfo = new OperateInfo();
            copyOperationProperties(operateVO, operateInfo);
            this.checkItem(operateInfo);
            operateInfo.image = operateVO.getSource();
            String res = foDelegate.updateOperate(operateInfo);
            /**返回1表示名称有重复，返回2表示标识有重复,返回3表示顺序有重复**/
            if (res.equals("1")) {
@@ -329,7 +355,7 @@
        if (operateInfo.name.length() > 128) {
            throw new VciBaseException("名称长度不能超过128！");
        }
        if (operateInfo.desc.length() > 255) {
        if (operateInfo.desc != null &&operateInfo.desc.length() > 255) {
            throw new VciBaseException("描述长度不能超过255！");
        }
        if (operateInfo.alias.length() > 128) {