报表优化

解决bug

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java

@@ -27,6 +27,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.mail.AuthenticationFailedException;
+import javax.mail.MessagingException;
 import java.util.List;
 
 /**
@@ -250,6 +252,8 @@ public class SysConfigController extends CoreBaseController {
             mailUtil.setTo(mailConfig.getTestTo());
             mailUtil.send();
             return ResultBean.success("测试邮件已发送").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(MessagingException messageExcep){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(messageExcep);
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -51,6 +51,7 @@ public class SysDictionaryController extends CoreBaseController{
         try {
             // 条件验证
             ValidatorBean.beginValid(sysDictionary)
+                    .notNull("id",sysDictionary.getId())
                     .notNull("name",sysDictionary.getName())
                     .notNull("dictionaryCode",sysDictionary.getDictionaryCode())
                     .notNull("dictionaryValue",sysDictionary.getDictionaryValue());
@@ -98,13 +99,21 @@ public class SysDictionaryController extends CoreBaseController{
         try {
             // 条件验证
             ValidatorBean.checkNotNull(idStr,"id不能为空");
-            if(sysDictionaryService.getSysDictionaryById(Long.parseLong(idStr)) == null){
+            SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(Long.parseLong(idStr));
+            if(sysDictionary == null){
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
                         .setErrorDetail("字典不存在")
                         .setErrorSolution("请重新选择")
                         .build();
+            }else if(sysDictionary.getIsDefault().intValue() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                        .setErrorDetail("默认字典不能删除")
+                        .setErrorSolution("请重新选择")
+                        .build();
             }
 
             sysDictionaryService.deleteSysDictionaryById(Long.parseLong(idStr));

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java

@@ -1,13 +1,16 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
+import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -21,6 +24,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -39,6 +43,9 @@ public class SysLocaleLanguageController extends CoreBaseController {
     @Autowired
     private ISysLocaleLanguageService sysLocaleLanguageService;
 
+    @Autowired
+    private ISystemInitService systemInitService;
+
     @PostMapping(value = "/insert")
     @ApiOperation(value = "添加系统语言",notes = "添加系统语言")
     public ResultBean insertSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage){
@@ -53,6 +60,8 @@ public class SysLocaleLanguageController extends CoreBaseController {
             sysLocaleLanguage.setLanguageStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
             sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage);
+
+            redisCore.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleLanguage.getLanguageCode(),new HashMap<>());
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -72,6 +81,9 @@ public class SysLocaleLanguageController extends CoreBaseController {
                     .notNull("languageCode", sysLocaleLanguage.getLanguageCode());
 
             sysLocaleLanguageService.updateSysLocaleLanguage(sysLocaleLanguage);
+
+            // 重新加载资源
+            systemInitService.loadSysLocaleLanguage();
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -86,8 +98,19 @@ public class SysLocaleLanguageController extends CoreBaseController {
         try {
             //条件验证
             ValidatorBean.checkNotNull(idStr,"id不能为空");
+            SysLocaleLanguage sysLocaleLanguage =sysLocaleLanguageService.getSysLocaleLanguageById(Long.parseLong(idStr));
+            if(sysLocaleLanguage == null){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                        .setErrorDetail("语言不存在")
+                        .build();
+            }
 
             sysLocaleLanguageService.deleteSysLocaleLanguageById(Long.parseLong(idStr));
+
+            // 移出缓存
+            redisCore.deleteKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleLanguage.getLanguageCode());
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -151,6 +174,9 @@ public class SysLocaleLanguageController extends CoreBaseController {
             }
 
             sysLocaleLanguageService.deleteSysLocaleLanguageByIds(StringTool.getArrayLong(idsStr));
+
+            // 重新加载语言资源
+            systemInitService.loadSysLocaleLanguage();
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
+import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description :系统语言资源服务
@@ -45,6 +48,9 @@ public class SysLocaleResourceController extends CoreBaseController {
     @Autowired
     private ISysLocaleResourceService sysLocaleResourceService;
 
+    @Autowired
+    private ISystemInitService systemInitService;
+
     @PostMapping(value = "/insert")
     @ApiOperation(value = "新增语言资源",notes = "新增语言资源")
     public ResultBean insertSysLocaleResource(SysLocaleResource sysLocaleResource){
@@ -57,15 +63,12 @@ public class SysLocaleResourceController extends CoreBaseController {
                     .notNull("resourceValue",sysLocaleResource.getResourceValue());
 
             //新增初始化
-//            ConvertBean.modelInitialize(sysLocaleResource, sessionUser);
             sysLocaleResource.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
 
-            sysLocaleResource = sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource);
+            sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource);
 
-            // 放入缓存
+            // 更新缓存信息
-            HashMap<String,String> resource = new HashMap<String,String>();
+            updateResourceCache(sysLocaleResource,false);
-            resource.put(sysLocaleResource.getLanguageCode(),sysLocaleResource.getResourceValue());
-            redisRes.putHashMap(sysLocaleResource.getResourceKey(),resource,0);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -86,15 +89,10 @@ public class SysLocaleResourceController extends CoreBaseController {
                     .checkNotZero("resourceType",sysLocaleResource.getResourceType())
                     .notNull("resourceValue",sysLocaleResource.getResourceValue());
 
-            //修改初始化
-//            ConvertBean.modelUpdate(sysLocaleResource, sessionUser);
-
             sysLocaleResourceService.updateSysLocaleResource(sysLocaleResource);
 
-            // 放入缓存
+            // 更新缓存信息
-            HashMap<String,String> resource = new HashMap<String,String>();
+            updateResourceCache(sysLocaleResource,false);
-            resource.put(sysLocaleResource.getLanguageCode(),sysLocaleResource.getResourceValue());
-            redisRes.putHashMap(sysLocaleResource.getResourceKey(),resource,0);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -109,8 +107,18 @@ public class SysLocaleResourceController extends CoreBaseController {
         try {
             //条件验证
             ValidatorBean.checkNotNull(idStr,"id不能为空");
+            SysLocaleResource sysLocaleResource =sysLocaleResourceService.getSysLocaleResourceById(Long.parseLong(idStr));
+            if(sysLocaleResource == null){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                        .setErrorDetail("资源不存在")
+                        .build();
+            }
 
             sysLocaleResourceService.deleteSysLocaleResourceById(Long.parseLong(idStr));
+
+            updateResourceCache(sysLocaleResource,false);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -158,6 +166,9 @@ public class SysLocaleResourceController extends CoreBaseController {
             }
 
             sysLocaleResourceService.deleteSysLocaleResourceByIds(StringTool.getArrayLong(idsStr));
+
+            // 重新加载资源
+            systemInitService.loadSysLocaleLanguage();
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -166,7 +177,7 @@ public class SysLocaleResourceController extends CoreBaseController {
         }
     }
 
-    @PutMapping(value = "batch-insert")
+    @PutMapping(value = "/batch-insert")
     @ApiOperation(value = "批量添加系统资源")
     public ResultBean insertSysLocaleResourceList(@RequestBody List<SysLocaleResource> sysLocaleResourcesList){
         try {
@@ -180,12 +191,8 @@ public class SysLocaleResourceController extends CoreBaseController {
 
             sysLocaleResourceService.insertSysLocaleResourceList(sysLocaleResourcesList);
 
-            HashMap<String,String> resource;
+            // 重新加载资源
-            for (SysLocaleResource item:sysLocaleResourcesList) {
+            systemInitService.loadSysLocaleLanguage();
-                resource = new HashMap();
-                resource.put(item.getLanguageCode(),item.getResourceValue());
-                redisRes.putHashMap(item.getResourceKey(),resource,0);
-            }
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -193,4 +200,32 @@ public class SysLocaleResourceController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    /**
+     * 更新缓存信息
+     * @param sysLocaleResource
+     * @param isDelete
+     */
+    private void updateResourceCache(SysLocaleResource sysLocaleResource,boolean isDelete){
+        // 判断是否为删除资源
+        if(isDelete){
+            Map<Object, Object> langMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode());
+            if (langMap != null && langMap.size() != 0) {
+                langMap.remove(sysLocaleResource.getResourceKey());
+                redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode(), langMap);
+            }
+
+            redisRes.deleteKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE  + sysLocaleResource.getResourceKey());
+        }else {
+            Map<Object, Object> langMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode());
+            if (langMap != null && langMap.size() != 0) {
+                langMap.put(sysLocaleResource.getResourceKey(), sysLocaleResource.getResourceValue());
+                redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode(), langMap);
+            }
+
+            HashMap<String, String> resource = new HashMap<String, String>();
+            resource.put(sysLocaleResource.getLanguageCode(), sysLocaleResource.getResourceValue());
+            redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getResourceKey(), resource, 0);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java

@@ -50,6 +50,9 @@ public class SysTaskController extends CoreBaseController {
                     .notNull("taskPackage", sysTask.getTaskPackage())
                     .notNull("taskClass", sysTask.getTaskClass());
 
+            Class classs= Class.forName(sysTask.getTaskPackage() + sysTask.getTaskClass());
+            System.out.println("============类信息：" + classs);
+
             sysTaskService.insertSysTask(sysTask);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTask);
         } catch (ImppBusiException busExcep) {

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestController.java

@@ -216,9 +216,9 @@ public class TestController {
             if (update || delete) {
                 // 查询批量修改或删除的数据
                 if (mongo) {
-                    list = syslogSystemService.findSysLogSystemByIdInterval(min,max);
+                    list = syslogSystemService.querySysLogSystemByPager(null, page).getObjectList();
                 } else {
-                    list = sysToolService.findSysToolByIdInterval(min,max);
+                    list = sysToolService.findSysToolByTop(num);
                 }
 
                 // 是否进行修改测试，并判断进行批量或逐次修改

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java

@@ -56,8 +56,9 @@ public class MessageMailQueueReceiver {
             msg = sysMessageService.insertSysMessage(msg);
             mailUtil.init();
 
-            // 系统预警邮件与用户邮件判断
             if(PlatformConstWords.CONTACT_MAIL.equals(msg.getMessageReceiversId())){
+                // 判断是否为系统紧急提示 微服注册状态提示
+
                 mailUtil.setSubject(msg.getMessageTitle());
                 mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
                 mailUtil.setBody(msg.getMessageContent());
@@ -66,7 +67,9 @@ public class MessageMailQueueReceiver {
                 // 次数过于频繁
 //                mailUtil.send();
 
-            } else if(PlatformConstWords.EXTERNAL_MAIL.equals(msg.getMessageReceiversId())){ //判断是否为外部邮件
+            } else if(PlatformConstWords.EXTERNAL_MAIL.equals(msg.getMessageReceiversId())){
+                //判断是否为外部邮件
+
                 mailUtil.setSubject(msg.getMessageTitle());
                 mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
                 mailUtil.setBody(msg.getMessageContent());
@@ -74,6 +77,7 @@ public class MessageMailQueueReceiver {
                 mailUtil.send();
 
             } else{
+                // 用户邮件
                 // 收件人信息
                 String[] messageReceiver = msg.getMessageReceiversId().split(",");
                 String[] receiverName = new String[messageReceiver.length];
@@ -105,12 +109,12 @@ public class MessageMailQueueReceiver {
                     mailUtil.send();
                 }
 
-                msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ","));
+                msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ","));
                 sysMessageService.updateSysMessage(msg);
             }
             //信息已处理
             channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
-        } catch (IOException e) {
+        } catch (Exception e) {
             LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}",e.getMessage(),e);
             //丢弃这条消息
             try {

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java

@@ -93,7 +93,7 @@ public class SysDictionaryService implements ISysDictionaryService {
         }
 
         // 数据反填
-        SysDictionary newSysDict = sysDictionaryRDao.getById(sysDictionary.getParentId());
+        SysDictionary newSysDict = sysDictionaryRDao.getById(sysDictionary.getId());
         newSysDict.setName(sysDictionary.getName());
         newSysDict.setDictionaryCode(sysDictionary.getDictionaryCode());
         newSysDict.setParentId(sysDictionary.getParentId());
@@ -108,12 +108,12 @@ public class SysDictionaryService implements ISysDictionaryService {
             SysDictionary parentSysDictionary = sysDictionaryRDao.getById(sysDictionary.getParentId());
             ValidatorBean.checkNotNull(parentSysDictionary);
 
-            sysDictionary.setParentNameRdd(parentSysDictionary.getName());
+            newSysDict.setParentNameRdd(parentSysDictionary.getName());
-            sysDictionary.setParentCodeRdd(parentSysDictionary.getDictionaryCode());
+            newSysDict.setParentCodeRdd(parentSysDictionary.getDictionaryCode());
         }
 
-        LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary);
+        LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",newSysDict);
-        sysDictionaryRDao.update(sysDictionary);
+        sysDictionaryRDao.update(newSysDict);
     }
 
     @Override
@@ -157,6 +157,15 @@ public class SysDictionaryService implements ISysDictionaryService {
     @Override
     @ApiOperation(value = "批量删除字典")
     public void deleteSysDictionaryByIds(Long[] ids) {
+        if (sysDictionaryRDao.findByHqlWhereCount(CoreHqlPack.packHqlSysDictionaryByIdsAndIsDefault(ids)) > 0) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                    .setErrorDetail("默认字典不可删除")
+                    .setErrorSolution("请重新选择")
+                    .build();
+        }
+
         LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids.toString());
         sysDictionaryRDao.deleteByIds(ids);
     }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java

@@ -98,6 +98,16 @@ public class SysTaskCycleService implements ISysTaskCycleService {
     @Override
     @ApiOperation(value = "根据id批量删除任务周期",notes = "根据id批量删除任务周期")
     public void deleteSysTaskCycleByIds(Long[] ids) {
+        int refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("taskCycleId",ids));
+        if(refExpressionTriggerList != 0){
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("存在关联任务计划，无法删除")
+                    .setErrorSolution("请重新选择")
+                    .build();
+        }
+
         sysTaskCycleRDao.deleteByIds(ids);
     }
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.SysTask;
 import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysTaskRepository;
@@ -40,13 +41,44 @@ public class SysTaskService implements ISysTaskService {
     @Override
     @ApiOperation(value = "添加任务",notes = "添加任务")
     public SysTask insertSysTask(SysTask sysTask) {
+        if(sysTaskRDao.findByPropertyCount("name",sysTask.getName()) > 0){
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("任务名称不能相同")
+                    .setErrorSolution("请重新输入")
+                    .build();
+        }
+
         return sysTaskRDao.insert(sysTask);
     }
 
     @Override
     @ApiOperation(value = "修改任务信息",notes = "修改任务信息")
     public void updateSysTask(SysTask sysTask) {
-        sysTaskRDao.update(sysTask);
+        // 业务校验，不能重名
+        StringBuffer sb = new StringBuffer();
+        HqlPack.getStringEqualPack(sysTask.getName(),"name",sb);
+        HqlPack.getNumNOEqualPack(sysTask.getId(),"id",sb);
+
+        if(sysTaskRDao.findByHqlWhereCount(sb.toString()) > 0){
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("任务名称不能相同")
+                    .setErrorSolution("请重新输入")
+                    .build();
+        }
+
+        SysTask newSysTask = sysTaskRDao.getById(sysTask.getId());
+        newSysTask.setName(sysTask.getName());
+        newSysTask.setTaskPackage(sysTask.getTaskPackage());
+        newSysTask.setTaskClass(sysTask.getTaskClass());
+        newSysTask.setTaskDescription(sysTask.getTaskDescription());
+        newSysTask.setModifyDatetime(sysTask.getModifyDatetime());
+        newSysTask.setModifyUser(sysTask.getModifyUser());
+
+        sysTaskRDao.update(newSysTask);
         // 修改冗余信息
         sysTaskPlanRDao.updateByProperties("taskId",sysTask.getId(),
                 "taskNameRdd",sysTask.getName());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java

@@ -72,10 +72,19 @@ public class SysToolService implements ISysToolService {
         SysToolType toolType = toolTypeRDao.getById(tool.getToolTypeId());
         ValidatorBean.checkNotNull(toolType);
 
-        tool.setToolTypeNameRdd(toolType.getName());
+        SysTool newSysTool = toolRDao.getById(tool.getId());
-
+        newSysTool.setName(tool.getName());
-        LOGGER.info("硬件 TOOL :{}",tool);
+        newSysTool.setToolConnType(tool.getToolConnType());
-        toolRDao.update(tool);
+        newSysTool.setToolDataType(tool.getToolDataType());
+        newSysTool.setToolIp(tool.getToolIp());
+        newSysTool.setToolPort(tool.getToolPort());
+        newSysTool.setToolDescription(tool.getToolDescription());
+        newSysTool.setToolTypeId(tool.getToolTypeId());
+        newSysTool.setToolTypeNameRdd(toolType.getName());
+        newSysTool.setToolOperating(tool.getToolOperating());
+
+        LOGGER.info("硬件 TOOL :{}",newSysTool);
+        toolRDao.update(newSysTool);
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java

@@ -170,8 +170,7 @@ public class MailUtil {
     /**
      * 发送邮件
      */
-    public void send() {
+    public void send() throws UnsupportedEncodingException, MessagingException {
-        try {
             Properties server = new Properties();
             server.put("mail.smtp.port", String.valueOf(this.smtpPort));
             server.put("mail.smtp.host", this.smtpHost);
@@ -213,12 +212,5 @@ public class MailUtil {
                 Transport.send(msg, msg.getAllRecipients());
             }
             LOGGER.info("邮件发送成功");
-        } catch (javax.mail.internet.AddressException e) {
-            e.printStackTrace();
-        } catch (MessagingException e) {
-            e.printStackTrace();
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.websocket;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 
 /**
@@ -13,5 +14,7 @@ public class TestMain {
 
     public static void main(String[] args) {
         System.out.println(RandomStringUtils.random(15, true, false));
+
+//        StringEscapeUtils.escapeHtml();
     }
 }