1、添加异常捕获

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BannerServiceImpl.java

@@ -22,12 +22,24 @@ public class BannerServiceImpl implements BannerService {
     //轮播图-轮播图列表
     @Override
     public Result<?> queryBannerList(PageBean pageBean) {
-        Page<WorkorderBanner> page = new Page<WorkorderBanner>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderBanner> pageList = workorderBannerService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("轮播图列表", pageList);
+        //返回信息
+        String message = "轮播图列表获取失败！";
+        //返回数据
+        Page<WorkorderBanner> page = null;//分页信息
+        Page<WorkorderBanner> pageList = null;//轮播图列表
+
+        try{
+            page = new Page<WorkorderBanner>(pageBean.getPageNo(), pageBean.getPageSize());
+            pageList = workorderBannerService
+                    .lambdaQuery()
+                    .page(page);
+            message = "轮播图列表";
+
+            return Result.OK(message, pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error(message, pageList);
+        }
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java

@@ -38,50 +38,62 @@ public class CollectionServiceImpl implements CollectionService {
     //收藏信息-我的收藏
     @Override
     public Result<?> queryCollectionList(String userId, String statusId, PageBean pageBean) {
+        //返回信息
+        String message = "";
+        //返回数据
+        Page<WorkorderCollection> page = null;//分页信息
+        LambdaQueryChainWrapper<WorkorderCollection> query = null;//多条件查询sql
+        Page<WorkorderCollection> pageList = null;//收藏表信息
+        List<WorkorderStatus> workorderStatus = null;//工单状态列表
+
+        try{
+
+            //分页
+            page = new Page<WorkorderCollection>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = workorderCollectionService.lambdaQuery();
+
+            //组装查询条件
+            if(null != userId){
+                //工单状态
+                query.eq(WorkorderCollection::getUserId, userId);
+            }
+            if(null != statusId){
+                //工单状态
+                query.eq(WorkorderCollection::getStatusId, statusId);
+            }
 
-        //分页
-        Page<WorkorderCollection> page = new Page<WorkorderCollection>(pageBean.getPageNo(), pageBean.getPageSize());
-        LambdaQueryChainWrapper<WorkorderCollection> query = workorderCollectionService
-                .lambdaQuery();
-
-        //组装查询条件
-        if(null != userId){
-            //工单状态
-            query.eq(WorkorderCollection::getUserId, userId);
-        }
-        if(null != statusId){
-            //工单状态
-            query.eq(WorkorderCollection::getStatusId, statusId);
-        }
-
-        //获取收藏表信息
-        Page<WorkorderCollection> pageList = query.page(page);
-
-        //工单状态列表
-        List<WorkorderStatus> workorderStatus = workorderStatusService
-                .lambdaQuery()
-                .list();
-
-        //将收藏工单信息放入收藏表中
-        for (WorkorderCollection record : pageList.getRecords()) {
-            WorkorderTemplate template = workorderTemplateService.getById(record.getTemplateId());
-            //添加工单状态说明
-            for (WorkorderStatus status : workorderStatus) {
-                //工单状态为空是，不设置状态描述
-                if(null != template.getStatusId()){
-                    if(template.getStatusId().equals(status.getId())){
-                        template.setStatusDescribe(status.getName());
-                        break;
+            //获取收藏表信息
+            pageList = query.page(page);
+
+            //工单状态列表
+            workorderStatus = workorderStatusService
+                    .lambdaQuery()
+                    .list();
+
+            //将收藏工单信息放入收藏表中
+            for (WorkorderCollection record : pageList.getRecords()) {
+                WorkorderTemplate template = workorderTemplateService.getById(record.getTemplateId());
+                //添加工单状态说明
+                for (WorkorderStatus status : workorderStatus) {
+                    //工单状态为空是，不设置状态描述
+                    if(null != template.getStatusId()){
+                        if(template.getStatusId().equals(status.getId())){
+                            template.setStatusDescribe(status.getName());
+                            break;
+                        }
+                    }else {
+                        continue;
                     }
-                }else {
-                    continue;
-                }
 
+                }
+                record.setWorkorderTemplate(template);
             }
-            record.setWorkorderTemplate(template);
-        }
 
-        return Result.OK("我的收藏列表", pageList);
+            return Result.OK("我的收藏列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("收藏列表获取失败", pageList);
+        }
 
     }
 
@@ -89,43 +101,48 @@ public class CollectionServiceImpl implements CollectionService {
     @Override
     public Result<?> addCollection(String userId, String templateId) {
 
-        //如果收藏已存在，再次点击则取消收藏
-        WorkorderCollection one = workorderCollectionService
-                .lambdaQuery()
-                .eq(WorkorderCollection::getUserId, userId)
-                .eq(WorkorderCollection::getTemplateId, templateId)
-                .one();
-
-        if(null != one){
-            boolean flag = workorderCollectionService.removeById(one.getId());
-            if(flag){
-                return Result.OK("取消收藏成功！");
-            }else {
-                return Result.error("取消收藏失败！");
+        try{
+            //如果收藏已存在，再次点击则取消收藏
+            WorkorderCollection one = workorderCollectionService
+                    .lambdaQuery()
+                    .eq(WorkorderCollection::getUserId, userId)
+                    .eq(WorkorderCollection::getTemplateId, templateId)
+                    .one();
+
+            if(null != one){
+                boolean flag = workorderCollectionService.removeById(one.getId());
+                if(flag){
+                    return Result.OK("取消收藏成功！");
+                }else {
+                    return Result.error("取消收藏失败！");
+                }
             }
-        }
-
-        //收藏对象
-        WorkorderTemplate template = workorderTemplateService
-                .lambdaQuery()
-                .eq(WorkorderTemplate::getId, templateId)
-                .one();
 
-        if(null != template){
-            WorkorderCollection collection = new WorkorderCollection();
-            collection.setUserId(userId);
-            collection.setTemplateId(templateId);
-            collection.setStatusId(template.getStatusId());
-
-            //执行添加收藏
-            boolean flag = workorderCollectionService.save(collection);
-            if(flag){
-                return Result.OK("收藏成功！");
+            //收藏对象
+            WorkorderTemplate template = workorderTemplateService
+                    .lambdaQuery()
+                    .eq(WorkorderTemplate::getId, templateId)
+                    .one();
+
+            if(null != template){
+                WorkorderCollection collection = new WorkorderCollection();
+                collection.setUserId(userId);
+                collection.setTemplateId(templateId);
+                collection.setStatusId(template.getStatusId());
+
+                //执行添加收藏
+                boolean flag = workorderCollectionService.save(collection);
+                if(flag){
+                    return Result.OK("收藏成功！");
+                }else {
+                    return Result.error("收藏失败！");
+                }
             }else {
-                return Result.error("收藏失败！");
+                return Result.error("该工单不存在，收藏失败！");
             }
-        }else {
-            return Result.error("该工单不存在，收藏失败！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("收藏失败！");
         }
 
     }
@@ -133,11 +150,16 @@ public class CollectionServiceImpl implements CollectionService {
     //取消收藏
     @Override
     public Result<?> deleteCollection(String userId, String collectonId) {
-        //执行添加收藏
-        boolean flag = workorderCollectionService.removeById(collectonId);
-        if(flag){
-            return Result.OK("取消收藏成功！");
-        }else {
+        try{
+            //执行添加收藏
+            boolean flag = workorderCollectionService.removeById(collectonId);
+            if(flag){
+                return Result.OK("取消收藏成功！");
+            }else {
+                return Result.error("取消收藏失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("取消收藏失败！");
         }
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java

@@ -55,72 +55,120 @@ public class ConfigServiceImpl implements ConfigService {
     //配置信息-帮助中心
     @Override
     public Result<?> helpInfo() {
-        //查询帮助中心详情
-        WorkorderConfig one = this.getConfigInfo("config_help");
-        return Result.OK("帮助中心", one);
+        try{
+            //查询帮助中心详情
+            WorkorderConfig one = this.getConfigInfo("config_help");
+            return Result.OK("帮助中心", one);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("帮助中心获取失败", null);
+        }
     }
 
     //配置信息-隐私协议
     @Override
     public Result<?> privacyInfo() {
-        //查询隐私条例详情
-        WorkorderConfig one = this.getConfigInfo("config_privacy");
-        return Result.OK("隐私条例", one);
+        try{
+            //查询隐私条例详情
+            WorkorderConfig one = this.getConfigInfo("config_privacy");
+            return Result.OK("隐私条例", one);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("隐私条例获取失败", null);
+        }
     }
 
     //查询用户角色配置信息
     @Override
     public Result<?> userRoleInfo(PageBean pageBean) {
-        Page<WorkorderRole> page = new Page<WorkorderRole>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderRole> pageList = workorderRoleService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("用户角色配置信息列表", pageList);
+        Page<WorkorderRole> page = null;
+        Page<WorkorderRole> pageList = null;
+        try{
+            page = new Page<WorkorderRole>(pageBean.getPageNo(), pageBean.getPageSize());
+            pageList = workorderRoleService
+                    .lambdaQuery()
+                    .page(page);
+
+            return Result.OK("用户角色配置信息列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("用户角色配置信息列表获取失败", pageList);
+        }
     }
 
     //查询工单状态配置
     @Override
     public Result<?> templateStatusInfo(PageBean pageBean) {
-        Page<WorkorderStatus> page = new Page<WorkorderStatus>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderStatus> pageList = workorderStatusService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("工单状态配置信息列表", pageList);
+        Page<WorkorderStatus> page = null;
+        Page<WorkorderStatus> pageList = null;
+
+        try{
+            page = new Page<WorkorderStatus>(pageBean.getPageNo(), pageBean.getPageSize());
+            pageList = workorderStatusService
+                    .lambdaQuery()
+                    .page(page);
+
+            return Result.OK("工单状态配置信息列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("工单状态配置信息列表获取失败", pageList);
+        }
     }
 
     //查询工序信息配置
     @Override
     public Result<?> stepInfo(PageBean pageBean) {
-        Page<WorkorderStep> page = new Page<WorkorderStep>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderStep> pageList = workorderStepService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("工序信息配置信息列表", pageList);
+        Page<WorkorderStep> page = null;
+        Page<WorkorderStep> pageList = null;
+
+        try{
+            page = new Page<WorkorderStep>(pageBean.getPageNo(), pageBean.getPageSize());
+            pageList = workorderStepService
+                    .lambdaQuery()
+                    .page(page);
+
+            return Result.OK("工序信息配置信息列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("工序信息配置信息列表获取失败", pageList);
+        }
     }
 
     //查询工序流程配置
     @Override
     public Result<?> processInfo(PageBean pageBean) {
-        Page<WorkorderProcess> page = new Page<WorkorderProcess>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderProcess> pageList = workorderProcessService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("工序流程配置信息列表", pageList);
+        Page<WorkorderProcess> page = null;
+        Page<WorkorderProcess> pageList = null;
+
+        try{
+            page = new Page<WorkorderProcess>(pageBean.getPageNo(), pageBean.getPageSize());
+            pageList = workorderProcessService
+                    .lambdaQuery()
+                    .page(page);
+
+            return Result.OK("工序流程配置信息列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("工序流程配置信息列表获取失败", pageList);
+        }
     }
 
     //查询检查项目配置
     @Override
     public Result<?> itemCheckInfo(PageBean pageBean) {
-        Page<WorkorderItemCheck> page = new Page<WorkorderItemCheck>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderItemCheck> pageList = workorderItemCheckService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("查询检查项目配置", pageList);
+        Page<WorkorderItemCheck> page = null;
+        Page<WorkorderItemCheck> pageList = null;
+        try{
+            page = new Page<WorkorderItemCheck>(pageBean.getPageNo(), pageBean.getPageSize());
+            pageList = workorderItemCheckService
+                    .lambdaQuery()
+                    .page(page);
+
+            return Result.OK("查询检查项目配置", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("查询检查项目配置获取失败", pageList);
+        }
     }
 
     /*************************************************************************************/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java

@@ -21,24 +21,38 @@ public class NewsServiceImpl implements NewsService {
     //公告信息-查询公告列表
     @Override
     public Result<?> queryNewsList(PageBean pageBean) {
-        Page<WorkorderNews> page = new Page<WorkorderNews>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderNews> pageList = workorderNewsService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("公告信息列表", pageList);
+        Page<WorkorderNews> page = null;
+        Page<WorkorderNews> pageList = null;
+
+        try{
+            page = new Page<WorkorderNews>(pageBean.getPageNo(), pageBean.getPageSize());
+            pageList = workorderNewsService
+                    .lambdaQuery()
+                    .page(page);
+
+            return Result.OK("公告信息列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("公告信息列表获取失败", pageList);
+        }
     }
 
     //公告信息-根据id查询公告信息
     @Override
     public Result<?> queryNewsById(String newsId) {
-        //查询公告信息详情
-        WorkorderNews one = workorderNewsService
-                .lambdaQuery()
-                .eq(WorkorderNews::getId, newsId)
-                .one();
-
-        return Result.OK("公告信息详情", one);
+        WorkorderNews one = null;
+        try{
+            //查询公告信息详情
+            one = workorderNewsService
+                    .lambdaQuery()
+                    .eq(WorkorderNews::getId, newsId)
+                    .one();
+
+            return Result.OK("公告信息详情", one);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.OK("公告信息详情获取失败", one);
+        }
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java

@@ -103,75 +103,85 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-查询工单列表
     @Override
     public Result<?> queryTemplateList(String userId, QueryTemplateBean templateBean, PageBean pageBean) {
-        //分页
-        Page<WorkorderTemplate> page = new Page<WorkorderTemplate>(pageBean.getPageNo(), pageBean.getPageSize());
-        LambdaQueryChainWrapper<WorkorderTemplate> query = workorderTemplateService
-                .lambdaQuery();
-
-        //组装查询条件
-        if(null != templateBean.getStatusId()){
-            //工单状态
-            query.eq(WorkorderTemplate::getStatusId, templateBean.getStatusId());
-        }
-        if(null != templateBean.getIsEmergency()){
-            //工单是否紧急
-            query.eq(WorkorderTemplate::getIsEmergency, templateBean.getIsEmergency());
-        }
-        if(null != templateBean.getResponsibler()){
-            //负责人
-            query.like(WorkorderTemplate::getResponsibler, templateBean.getResponsibler());
-        }
-        if(null != templateBean.getTaskNo()){
-            //任务号
-            query.like(WorkorderTemplate::getTaskNo, templateBean.getTaskNo());
-        }
+        try{
+            //分页
+            Page<WorkorderTemplate> page = new Page<WorkorderTemplate>(pageBean.getPageNo(), pageBean.getPageSize());
+            LambdaQueryChainWrapper<WorkorderTemplate> query = workorderTemplateService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(null != templateBean.getStatusId()){
+                //工单状态
+                query.eq(WorkorderTemplate::getStatusId, templateBean.getStatusId());
+            }
+            if(null != templateBean.getIsEmergency()){
+                //工单是否紧急
+                query.eq(WorkorderTemplate::getIsEmergency, templateBean.getIsEmergency());
+            }
+            if(null != templateBean.getResponsibler()){
+                //负责人
+                query.like(WorkorderTemplate::getResponsibler, templateBean.getResponsibler());
+            }
+            if(null != templateBean.getTaskNo()){
+                //任务号
+                query.like(WorkorderTemplate::getTaskNo, templateBean.getTaskNo());
+            }
 
-        //获取账本信息
-        Page<WorkorderTemplate> pageList = query.page(page);
+            //获取账本信息
+            Page<WorkorderTemplate> pageList = query.page(page);
 
-        //添加工单是否被收藏标识
-        List<WorkorderCollection> collectionList = workorderCollectionService
-                .lambdaQuery()
-                .eq(WorkorderCollection::getUserId, userId)
-                .list();
-        for (WorkorderTemplate record : pageList.getRecords()) {
-            boolean flag = false;
-            for (WorkorderCollection collection : collectionList) {
-                if(record.getId().equals(collection.getTemplateId())){
-                    flag = true;
-                    break;
+            //添加工单是否被收藏标识
+            List<WorkorderCollection> collectionList = workorderCollectionService
+                    .lambdaQuery()
+                    .eq(WorkorderCollection::getUserId, userId)
+                    .list();
+            for (WorkorderTemplate record : pageList.getRecords()) {
+                boolean flag = false;
+                for (WorkorderCollection collection : collectionList) {
+                    if(record.getId().equals(collection.getTemplateId())){
+                        flag = true;
+                        break;
+                    }
                 }
+                record.setCollectonFlag(flag);
             }
-            record.setCollectonFlag(flag);
-        }
 
-        return Result.OK("工单列表", pageList);
+            return Result.OK("工单列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("工单列表获取失败", null);
+        }
     }
 
     //工单信息-修改工单
     @Override
     public Result<?> updateTemplate(WorkorderTemplate workorderTemplate) {
-        //修改工单信息
-        boolean flag = workorderTemplateService.updateById(workorderTemplate);
+        try{
+            //修改工单信息
+            boolean flag = workorderTemplateService.updateById(workorderTemplate);
 
-        //修改收藏表工单状态
-        boolean collectionFlag = false;
-        List<WorkorderCollection> list = workorderCollectionService
-                .lambdaQuery()
-                .eq(WorkorderCollection::getTemplateId, workorderTemplate.getId())
-                .list();
-        if(list.size() != 0){
-            for (WorkorderCollection collection : list) {
-                collection.setStatusId(workorderTemplate.getStatusId());
+            //修改收藏表工单状态
+            boolean collectionFlag = false;
+            List<WorkorderCollection> list = workorderCollectionService
+                    .lambdaQuery()
+                    .eq(WorkorderCollection::getTemplateId, workorderTemplate.getId())
+                    .list();
+            if(list.size() != 0){
+                for (WorkorderCollection collection : list) {
+                    collection.setStatusId(workorderTemplate.getStatusId());
+                }
+                collectionFlag = workorderCollectionService.updateBatchById(list);
+            }else {
+                collectionFlag = true;
             }
-            collectionFlag = workorderCollectionService.updateBatchById(list);
-        }else {
-            collectionFlag = true;
-        }
 
-        if(flag && collectionFlag){
-            return Result.OK("修改工单信息成功！");
-        }else {
+            if(flag && collectionFlag){
+                return Result.OK("修改工单信息成功！");
+            }else {
+                return Result.error("修改工单信息失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("修改工单信息失败！");
         }
     }
@@ -180,27 +190,32 @@ public class TemplateServiceImpl implements TemplateService {
     @Override
     public Result<?> deleteTemplate(String templateId){
 
-        //收藏表信息删除成功与否标识
-        boolean collectionFlage = deleteCollection(templateId);
-
-        //删除工单参数
-        boolean workorderGeneralSteponeFlag = deleteGeneralStepOne(templateId);//常规参数-工序卡1
-        boolean workorderGeneralSteptwoFlag = deleteGeneralStepTwo(templateId);//常规参数-工序卡2
-        boolean workorderGeneralStepthreeFlag = deleteGeneralStepThree(templateId);//常规参数-工序卡3
-        boolean workorderGeneralStepfourFlag = deleteGeneralStepFour(templateId);//常规参数-工序卡4
-
-        //检查项目参数
-        boolean workorderParamSteponeFlag = deleteParamStepOne(templateId);//检查项目参数-工序卡1
-        boolean workorderParamSteptwoFlag = deleteParamStepTwo(templateId);//检查项目参数-工序卡2
-        boolean workorderParamStepthreeFlag = deleteParamStepThree(templateId);//检查项目参数-工序卡3
-        boolean workorderParamStepfourFlag = deleteParamStepFour(templateId);//检查项目参数-工序卡4
-
-        //删除工单信息
-        boolean templateFlag = workorderTemplateService.removeById(templateId);
-
-        if(templateFlag){
-            return Result.OK("工单删除成功！");
-        }else {
+        try{
+            //收藏表信息删除成功与否标识
+            boolean collectionFlage = deleteCollection(templateId);
+
+            //删除工单参数
+            boolean workorderGeneralSteponeFlag = deleteGeneralStepOne(templateId);//常规参数-工序卡1
+            boolean workorderGeneralSteptwoFlag = deleteGeneralStepTwo(templateId);//常规参数-工序卡2
+            boolean workorderGeneralStepthreeFlag = deleteGeneralStepThree(templateId);//常规参数-工序卡3
+            boolean workorderGeneralStepfourFlag = deleteGeneralStepFour(templateId);//常规参数-工序卡4
+
+            //检查项目参数
+            boolean workorderParamSteponeFlag = deleteParamStepOne(templateId);//检查项目参数-工序卡1
+            boolean workorderParamSteptwoFlag = deleteParamStepTwo(templateId);//检查项目参数-工序卡2
+            boolean workorderParamStepthreeFlag = deleteParamStepThree(templateId);//检查项目参数-工序卡3
+            boolean workorderParamStepfourFlag = deleteParamStepFour(templateId);//检查项目参数-工序卡4
+
+            //删除工单信息
+            boolean templateFlag = workorderTemplateService.removeById(templateId);
+
+            if(templateFlag){
+                return Result.OK("工单删除成功！");
+            }else {
+                return Result.error("工单删除失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("工单删除失败！");
         }
     }
@@ -524,17 +539,22 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改常规参数-工序卡1(选配)
     @Override
     public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionGeneral(roleId, generalStepone.getStepId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionGeneral(roleId, generalStepone.getStepId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderGeneralSteponeService.saveOrUpdate(generalStepone);
+            boolean flag = workorderGeneralSteponeService.saveOrUpdate(generalStepone);
 
-        if(flag){
-            return Result.OK("新增/修改常规参数-工序卡1成功！");
-        }else {
+            if(flag){
+                return Result.OK("新增/修改常规参数-工序卡1成功！");
+            }else {
+                return Result.error("新增/修改常规参数-工序卡1失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改常规参数-工序卡1失败！");
         }
     }
@@ -542,16 +562,21 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改常规参数-工序卡2
     @Override
     public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionGeneral(roleId, generalSteptwo.getStepId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionGeneral(roleId, generalSteptwo.getStepId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderGeneralSteptwoService.saveOrUpdate(generalSteptwo);
-        if(flag){
-            return Result.OK("新增/修改常规参数-工序卡2成功！");
-        }else {
+            boolean flag = workorderGeneralSteptwoService.saveOrUpdate(generalSteptwo);
+            if(flag){
+                return Result.OK("新增/修改常规参数-工序卡2成功！");
+            }else {
+                return Result.error("新增/修改常规参数-工序卡2失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改常规参数-工序卡2失败！");
         }
     }
@@ -559,16 +584,21 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改常规参数-工序卡3
     @Override
     public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionGeneral(roleId, generalStepthree.getStepId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionGeneral(roleId, generalStepthree.getStepId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderGeneralStepthreeService.saveOrUpdate(generalStepthree);
-        if(flag){
-            return Result.OK("新增/修改常规参数-工序卡3成功！");
-        }else {
+            boolean flag = workorderGeneralStepthreeService.saveOrUpdate(generalStepthree);
+            if(flag){
+                return Result.OK("新增/修改常规参数-工序卡3成功！");
+            }else {
+                return Result.error("新增/修改常规参数-工序卡3失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改常规参数-工序卡3失败！");
         }
     }
@@ -576,16 +606,21 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改常规参数-工序卡4(总成)
     @Override
     public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionGeneral(roleId, generalStepfour.getStepId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionGeneral(roleId, generalStepfour.getStepId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderGeneralStepfourService.saveOrUpdate(generalStepfour);
-        if(flag){
-            return Result.OK("新增/修改常规参数-工序卡4成功！");
-        }else {
+            boolean flag = workorderGeneralStepfourService.saveOrUpdate(generalStepfour);
+            if(flag){
+                return Result.OK("新增/修改常规参数-工序卡4成功！");
+            }else {
+                return Result.error("新增/修改常规参数-工序卡4失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改常规参数-工序卡4失败！");
         }
     }
@@ -593,16 +628,21 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改工序参数-工序卡1(选配)
     @Override
     public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionParam(roleId, paramStepone.getProcessId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionParam(roleId, paramStepone.getProcessId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderParamSteponeService.saveOrUpdate(paramStepone);
-        if(flag){
-            return Result.OK("新增/修改工序参数-工序卡1成功！");
-        }else {
+            boolean flag = workorderParamSteponeService.saveOrUpdate(paramStepone);
+            if(flag){
+                return Result.OK("新增/修改工序参数-工序卡1成功！");
+            }else {
+                return Result.error("新增/修改工序参数-工序卡1失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改工序参数-工序卡1失败！");
         }
     }
@@ -610,16 +650,21 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改工序参数-工序卡2
     @Override
     public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionParam(roleId, paramSteptwo.getProcessId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionParam(roleId, paramSteptwo.getProcessId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderParamSteptwoService.saveOrUpdate(paramSteptwo);
-        if(flag){
-            return Result.OK("新增/修改工序参数-工序卡2成功！");
-        }else {
+            boolean flag = workorderParamSteptwoService.saveOrUpdate(paramSteptwo);
+            if(flag){
+                return Result.OK("新增/修改工序参数-工序卡2成功！");
+            }else {
+                return Result.error("新增/修改工序参数-工序卡2失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改工序参数-工序卡2失败！");
         }
     }
@@ -627,16 +672,21 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改工序参数-工序卡3
     @Override
     public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionParam(roleId, paramStepthree.getProcessId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionParam(roleId, paramStepthree.getProcessId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderParamStepthreeService.saveOrUpdate(paramStepthree);
-        if(flag){
-            return Result.OK("新增/修改工序参数-工序卡3成功！");
-        }else {
+            boolean flag = workorderParamStepthreeService.saveOrUpdate(paramStepthree);
+            if(flag){
+                return Result.OK("新增/修改工序参数-工序卡3成功！");
+            }else {
+                return Result.error("新增/修改工序参数-工序卡3失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改工序参数-工序卡3失败！");
         }
     }
@@ -644,259 +694,278 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改工序参数-工序卡4(总成)
     @Override
     public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String roleId) {
-        //判断是否有工序操作权限
-        boolean permission = judgePermissionParam(roleId, paramStepfour.getProcessId());
-        if(!permission){
-            return Result.error("没有该工序的操作权限");
-        }
+        try{
+            //判断是否有工序操作权限
+            boolean permission = judgePermissionParam(roleId, paramStepfour.getProcessId());
+            if(!permission){
+                return Result.error("没有该工序的操作权限");
+            }
 
-        boolean flag = workorderParamStepfourService.saveOrUpdate(paramStepfour);
-        if(flag){
-            return Result.OK("新增/修改工序参数-工序卡4成功！");
-        }else {
+            boolean flag = workorderParamStepfourService.saveOrUpdate(paramStepfour);
+            if(flag){
+                return Result.OK("新增/修改工序参数-工序卡4成功！");
+            }else {
+                return Result.error("新增/修改工序参数-工序卡4失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("新增/修改工序参数-工序卡4失败！");
         }
     }
 
     //工单信息-检查项目参数修改权限判断
-    public Boolean judgePermissionParam(String roleId, String checkItemId) {
-
+    public Boolean judgePermissionParam(String roleId, String checkItemId)  {
         //返回结果
         boolean result = false;
 
-        //根据角色id获取拥有的权限
-        List<WorkorderPermissionCheckitem> permissionList = workorderPermissionCheckitemService
-                .lambdaQuery()
-                .eq(WorkorderPermissionCheckitem::getRoleId, roleId)
-                .list();
+        try{
+            //根据角色id获取拥有的权限
+            List<WorkorderPermissionCheckitem> permissionList = workorderPermissionCheckitemService
+                    .lambdaQuery()
+                    .eq(WorkorderPermissionCheckitem::getRoleId, roleId)
+                    .list();
 
-        //判断是否有修改的权限
-        for (WorkorderPermissionCheckitem permission : permissionList) {
-            if(checkItemId.equals(permission.getCheckItemId())){
-                result = true;
-                break;
+            //判断是否有修改的权限
+            for (WorkorderPermissionCheckitem permission : permissionList) {
+                if(checkItemId.equals(permission.getCheckItemId())){
+                    result = true;
+                    break;
+                }
             }
-        }
 
-        return result;
+            return result;
+        }catch (Exception e){
+            e.printStackTrace();
+            return result;
+        }
     }
 
     //工单信息-检查项目参数修改权限判断
     public Boolean judgePermissionGeneral(String roleId, String stepId) {
-
         //返回结果
         boolean result = false;
 
-        //根据角色id获取拥有的权限
-        List<WorkorderPermissionStep> permissionList = workorderPermissionStepService
-                .lambdaQuery()
-                .eq(WorkorderPermissionStep::getRoleId, roleId)
-                .list();
+        try{
+
+            //根据角色id获取拥有的权限
+            List<WorkorderPermissionStep> permissionList = workorderPermissionStepService
+                    .lambdaQuery()
+                    .eq(WorkorderPermissionStep::getRoleId, roleId)
+                    .list();
 
-        //判断是否有修改的权限
-        for (WorkorderPermissionStep permission : permissionList) {
-            if(stepId.equals(permission.getStepId())){
-                result = true;
-                break;
+            //判断是否有修改的权限
+            for (WorkorderPermissionStep permission : permissionList) {
+                if(stepId.equals(permission.getStepId())){
+                    result = true;
+                    break;
+                }
             }
-        }
 
-        return result;
+            return result;
+        }catch (Exception e){
+            e.printStackTrace();
+            return  result;
+        }
     }
 
     /*********************************************************************************************************/
     //工单信息-查询工单详情
     @Override
     public Result<?> queryTemplateById(String userId, String templateId){
+        WorkorderTemplate workorderTemplate = new WorkorderTemplate();
+        try{
+            //查询工单信息
+            workorderTemplate = workorderTemplateService
+                    .lambdaQuery()
+                    .eq(WorkorderTemplate::getId, templateId)
+                    .one();
 
-        //查询工单信息
-        WorkorderTemplate workorderTemplate = workorderTemplateService
-                .lambdaQuery()
-                .eq(WorkorderTemplate::getId, templateId)
-                .one();
-
-        //查看工单是否被收藏
-        WorkorderCollection collection = workorderCollectionService
-                .lambdaQuery()
-                .eq(WorkorderCollection::getUserId, userId)
-                .eq(WorkorderCollection::getTemplateId, templateId)
-                .one();
-        if(null != collection){
-            workorderTemplate.setCollectonFlag(true);
-        }else {
-            workorderTemplate.setCollectonFlag(false);
-        }
+            //查看工单是否被收藏
+            WorkorderCollection collection = workorderCollectionService
+                    .lambdaQuery()
+                    .eq(WorkorderCollection::getUserId, userId)
+                    .eq(WorkorderCollection::getTemplateId, templateId)
+                    .one();
+            if(null != collection){
+                workorderTemplate.setCollectonFlag(true);
+            }else {
+                workorderTemplate.setCollectonFlag(false);
+            }
 
-        //查询工序卡信息
-        List<WorkorderStep> stepList = workorderStepService
-                .lambdaQuery()
-                .list();
+            //查询工序卡信息
+            List<WorkorderStep> stepList = workorderStepService
+                    .lambdaQuery()
+                    .list();
 
-        //查询工序信息
-        List<WorkorderProcess> processList = workorderProcessService
-                .lambdaQuery()
-                .list();
+            //查询工序信息
+            List<WorkorderProcess> processList = workorderProcessService
+                    .lambdaQuery()
+                    .list();
 
-        //查询检查项目信息
-        List<WorkorderItemCheck> itemCheckList = workorderItemCheckService
-                .lambdaQuery()
-                .list();
+            //查询检查项目信息
+            List<WorkorderItemCheck> itemCheckList = workorderItemCheckService
+                    .lambdaQuery()
+                    .list();
 
-        //根据工单id查询常规参数
-        List<WorkorderGeneralStepone> GeneralSteponeList = workorderGeneralSteponeService
-                .lambdaQuery()
-                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
-                .list();
-        List<WorkorderGeneralSteptwo> GeneralSteptwoList = workorderGeneralSteptwoService
-                .lambdaQuery()
-                .eq(WorkorderGeneralSteptwo::getTemplateId, templateId)
-                .list();
-        List<WorkorderGeneralStepthree> GeneralStepthreeList = workorderGeneralStepthreeService
-                .lambdaQuery()
-                .eq(WorkorderGeneralStepthree::getTemplateId, templateId)
-                .list();
-        List<WorkorderGeneralStepfour> GeneralStepfourList = workorderGeneralStepfourService
-                .lambdaQuery()
-                .eq(WorkorderGeneralStepfour::getTemplateId, templateId)
-                .list();
+            //根据工单id查询常规参数
+            List<WorkorderGeneralStepone> GeneralSteponeList = workorderGeneralSteponeService
+                    .lambdaQuery()
+                    .eq(WorkorderGeneralStepone::getTemplateId, templateId)
+                    .list();
+            List<WorkorderGeneralSteptwo> GeneralSteptwoList = workorderGeneralSteptwoService
+                    .lambdaQuery()
+                    .eq(WorkorderGeneralSteptwo::getTemplateId, templateId)
+                    .list();
+            List<WorkorderGeneralStepthree> GeneralStepthreeList = workorderGeneralStepthreeService
+                    .lambdaQuery()
+                    .eq(WorkorderGeneralStepthree::getTemplateId, templateId)
+                    .list();
+            List<WorkorderGeneralStepfour> GeneralStepfourList = workorderGeneralStepfourService
+                    .lambdaQuery()
+                    .eq(WorkorderGeneralStepfour::getTemplateId, templateId)
+                    .list();
 
-        //根据工单id查询检查项目参数
-        List<WorkorderParamStepone> paramSteponeList = workorderParamSteponeService
-                .lambdaQuery()
-                .eq(WorkorderParamStepone::getTemplateId, templateId)
-                .list();
-        List<WorkorderParamSteptwo> paramSteptwoList = workorderParamSteptwoService
-                .lambdaQuery()
-                .eq(WorkorderParamSteptwo::getTemplateId, templateId)
-                .list();
-        List<WorkorderParamStepthree> paramStepthreeList = workorderParamStepthreeService
-                .lambdaQuery()
-                .eq(WorkorderParamStepthree::getTemplateId, templateId)
-                .list();
-        List<WorkorderParamStepfour> paramStepfourList = workorderParamStepfourService
-                .lambdaQuery()
-                .eq(WorkorderParamStepfour::getTemplateId, templateId)
-                .list();
+            //根据工单id查询检查项目参数
+            List<WorkorderParamStepone> paramSteponeList = workorderParamSteponeService
+                    .lambdaQuery()
+                    .eq(WorkorderParamStepone::getTemplateId, templateId)
+                    .list();
+            List<WorkorderParamSteptwo> paramSteptwoList = workorderParamSteptwoService
+                    .lambdaQuery()
+                    .eq(WorkorderParamSteptwo::getTemplateId, templateId)
+                    .list();
+            List<WorkorderParamStepthree> paramStepthreeList = workorderParamStepthreeService
+                    .lambdaQuery()
+                    .eq(WorkorderParamStepthree::getTemplateId, templateId)
+                    .list();
+            List<WorkorderParamStepfour> paramStepfourList = workorderParamStepfourService
+                    .lambdaQuery()
+                    .eq(WorkorderParamStepfour::getTemplateId, templateId)
+                    .list();
 
-        //一、将检查项目参数对象放入对应检查项目对象下
-        for (WorkorderItemCheck workorderItemCheck : itemCheckList) {
-            //工序卡1
-            List<WorkorderParamStepone> workorderParamSteponeList = new ArrayList<>();
-            for (WorkorderParamStepone workorderParamStepone : paramSteponeList) {
-                if(workorderParamStepone.getProcessId().equals(workorderItemCheck.getId()) ){
-                    workorderParamSteponeList.add(workorderParamStepone);
+            //一、将检查项目参数对象放入对应检查项目对象下
+            for (WorkorderItemCheck workorderItemCheck : itemCheckList) {
+                //工序卡1
+                List<WorkorderParamStepone> workorderParamSteponeList = new ArrayList<>();
+                for (WorkorderParamStepone workorderParamStepone : paramSteponeList) {
+                    if(workorderParamStepone.getProcessId().equals(workorderItemCheck.getId()) ){
+                        workorderParamSteponeList.add(workorderParamStepone);
+                    }
                 }
-            }
-            workorderItemCheck.setWorkorderParamSteponeList(workorderParamSteponeList);
-
-            //工序卡2
-            List<WorkorderParamSteptwo> workorderParamSteptwoList = new ArrayList<>();
-            for (WorkorderParamSteptwo workorderParamSteptwo : paramSteptwoList) {
-                if(workorderParamSteptwo.getProcessId().equals(workorderItemCheck.getId())){
-                    workorderParamSteptwoList.add(workorderParamSteptwo);
+                workorderItemCheck.setWorkorderParamSteponeList(workorderParamSteponeList);
+
+                //工序卡2
+                List<WorkorderParamSteptwo> workorderParamSteptwoList = new ArrayList<>();
+                for (WorkorderParamSteptwo workorderParamSteptwo : paramSteptwoList) {
+                    if(workorderParamSteptwo.getProcessId().equals(workorderItemCheck.getId())){
+                        workorderParamSteptwoList.add(workorderParamSteptwo);
+                    }
                 }
-            }
-            workorderItemCheck.setWorkorderParamSteptwoList(workorderParamSteptwoList);
-
-            //工序卡3
-            List<WorkorderParamStepthree> workorderParamStepthreeList = new ArrayList<>();
-            for (WorkorderParamStepthree workorderParamStepthree : paramStepthreeList) {
-                if(workorderParamStepthree.getProcessId().equals(workorderItemCheck.getId())){
-                    workorderParamStepthreeList.add(workorderParamStepthree);
+                workorderItemCheck.setWorkorderParamSteptwoList(workorderParamSteptwoList);
+
+                //工序卡3
+                List<WorkorderParamStepthree> workorderParamStepthreeList = new ArrayList<>();
+                for (WorkorderParamStepthree workorderParamStepthree : paramStepthreeList) {
+                    if(workorderParamStepthree.getProcessId().equals(workorderItemCheck.getId())){
+                        workorderParamStepthreeList.add(workorderParamStepthree);
+                    }
                 }
-            }
-            workorderItemCheck.setWorkorderParamStepthreeList(workorderParamStepthreeList);
-
-            //工序卡4
-            List<WorkorderParamStepfour> workorderParamStepfourList = new ArrayList<>();
-            for (WorkorderParamStepfour workorderParamStepfour : paramStepfourList) {
-                if(workorderParamStepfour.getProcessId().equals(workorderItemCheck.getId())){
-                    workorderParamStepfourList.add(workorderParamStepfour);
+                workorderItemCheck.setWorkorderParamStepthreeList(workorderParamStepthreeList);
+
+                //工序卡4
+                List<WorkorderParamStepfour> workorderParamStepfourList = new ArrayList<>();
+                for (WorkorderParamStepfour workorderParamStepfour : paramStepfourList) {
+                    if(workorderParamStepfour.getProcessId().equals(workorderItemCheck.getId())){
+                        workorderParamStepfourList.add(workorderParamStepfour);
+                    }
                 }
-            }
-            workorderItemCheck.setWorkorderParamStepfourList(workorderParamStepfourList);
+                workorderItemCheck.setWorkorderParamStepfourList(workorderParamStepfourList);
 
-        }
-
-        //二、将检查项目对象放入对应工序流程对象下
-        for (WorkorderProcess workorderProcess : processList) {
-            List<WorkorderItemCheck> workorderItemCheckList = new ArrayList<>();
-            for (WorkorderItemCheck workorderItemCheck : itemCheckList) {
-                if(workorderItemCheck.getProcessId().equals(workorderProcess.getId())){
-                    workorderItemCheckList.add(workorderItemCheck);
-                }
             }
-            workorderProcess.setWorkorderItemCheckList(workorderItemCheckList);
-        }
 
-        //三、将工序流程对象放入对应工序卡对象下
-        for (WorkorderStep workorderStep : stepList) {
-            //工序参数
-            List<WorkorderProcess> workorderProcessList = new ArrayList<>();
+            //二、将检查项目对象放入对应工序流程对象下
             for (WorkorderProcess workorderProcess : processList) {
-                if(workorderProcess.getStepId().equals(workorderStep.getId())){
-                    workorderProcessList.add(workorderProcess);
+                List<WorkorderItemCheck> workorderItemCheckList = new ArrayList<>();
+                for (WorkorderItemCheck workorderItemCheck : itemCheckList) {
+                    if(workorderItemCheck.getProcessId().equals(workorderProcess.getId())){
+                        workorderItemCheckList.add(workorderItemCheck);
+                    }
                 }
+                workorderProcess.setWorkorderItemCheckList(workorderItemCheckList);
             }
-            workorderStep.setWorkorderProcessList(workorderProcessList);
 
-            //常规参数(待优化--冗余list)
-            //工序卡1
-            List<WorkorderGeneralStepone> workorderGeneralSteponeList = new ArrayList<>();
-            for (WorkorderGeneralStepone generalStepone : GeneralSteponeList) {
-                if(generalStepone.getStepId().equals(workorderStep.getId())){
-                    workorderGeneralSteponeList.add(generalStepone);
+            //三、将工序流程对象放入对应工序卡对象下
+            for (WorkorderStep workorderStep : stepList) {
+                //工序参数
+                List<WorkorderProcess> workorderProcessList = new ArrayList<>();
+                for (WorkorderProcess workorderProcess : processList) {
+                    if(workorderProcess.getStepId().equals(workorderStep.getId())){
+                        workorderProcessList.add(workorderProcess);
+                    }
                 }
-            }
-            workorderStep.setWorkorderGeneralSteponeList(workorderGeneralSteponeList);
-
-            //工序卡2
-            List<WorkorderGeneralSteptwo> workorderGeneralSteptwoList = new ArrayList<>();
-            for (WorkorderGeneralSteptwo generalSteptwo : GeneralSteptwoList) {
-                if(generalSteptwo.getStepId().equals(workorderStep.getId())){
-                    workorderGeneralSteptwoList.add(generalSteptwo);
+                workorderStep.setWorkorderProcessList(workorderProcessList);
+
+                //常规参数(待优化--冗余list)
+                //工序卡1
+                List<WorkorderGeneralStepone> workorderGeneralSteponeList = new ArrayList<>();
+                for (WorkorderGeneralStepone generalStepone : GeneralSteponeList) {
+                    if(generalStepone.getStepId().equals(workorderStep.getId())){
+                        workorderGeneralSteponeList.add(generalStepone);
+                    }
                 }
-            }
-            workorderStep.setWorkorderGeneralSteptwoList(workorderGeneralSteptwoList);
-
-            //工序卡3
-            List<WorkorderGeneralStepthree> workorderGeneralStepthreeList = new ArrayList<>();
-            for (WorkorderGeneralStepthree generalStepthree : GeneralStepthreeList) {
-                if(generalStepthree.getStepId().equals(workorderStep.getId())){
-                    workorderGeneralStepthreeList.add(generalStepthree);
+                workorderStep.setWorkorderGeneralSteponeList(workorderGeneralSteponeList);
+
+                //工序卡2
+                List<WorkorderGeneralSteptwo> workorderGeneralSteptwoList = new ArrayList<>();
+                for (WorkorderGeneralSteptwo generalSteptwo : GeneralSteptwoList) {
+                    if(generalSteptwo.getStepId().equals(workorderStep.getId())){
+                        workorderGeneralSteptwoList.add(generalSteptwo);
+                    }
                 }
-            }
-            workorderStep.setWorkorderGeneralStepthreeList(workorderGeneralStepthreeList);
-
-            //工序卡4
-            List<WorkorderGeneralStepfour> workorderGeneralStepfourList = new ArrayList<>();
-            for (WorkorderGeneralStepfour generalStepfour : GeneralStepfourList) {
-                if(generalStepfour.getStepId().equals(workorderStep.getId())){
-                    workorderGeneralStepfourList.add(generalStepfour);
+                workorderStep.setWorkorderGeneralSteptwoList(workorderGeneralSteptwoList);
+
+                //工序卡3
+                List<WorkorderGeneralStepthree> workorderGeneralStepthreeList = new ArrayList<>();
+                for (WorkorderGeneralStepthree generalStepthree : GeneralStepthreeList) {
+                    if(generalStepthree.getStepId().equals(workorderStep.getId())){
+                        workorderGeneralStepthreeList.add(generalStepthree);
+                    }
                 }
-            }
-            workorderStep.setWorkorderGeneralStepfourList(workorderGeneralStepfourList);
-
-        }
+                workorderStep.setWorkorderGeneralStepthreeList(workorderGeneralStepthreeList);
+
+                //工序卡4
+                List<WorkorderGeneralStepfour> workorderGeneralStepfourList = new ArrayList<>();
+                for (WorkorderGeneralStepfour generalStepfour : GeneralStepfourList) {
+                    if(generalStepfour.getStepId().equals(workorderStep.getId())){
+                        workorderGeneralStepfourList.add(generalStepfour);
+                    }
+                }
+                workorderStep.setWorkorderGeneralStepfourList(workorderGeneralStepfourList);
 
-        //四、将工序卡对象放入对应工单对象下
-        workorderTemplate.setWorkorderStepList(stepList);
+            }
 
-        //补充工单状态描述
-        if(null != workorderTemplate.getStatusId()){
-            List<WorkorderStatus> workorderStatus = workorderStatusService
-                    .lambdaQuery()
-                    .list();
-            for (WorkorderStatus status : workorderStatus) {
-                if(workorderTemplate.getStatusId().equals(status.getId())){
-                    workorderTemplate.setStatusDescribe(status.getName());
-                    break;
+            //四、将工序卡对象放入对应工单对象下
+            workorderTemplate.setWorkorderStepList(stepList);
+
+            //补充工单状态描述
+            if(null != workorderTemplate.getStatusId()){
+                List<WorkorderStatus> workorderStatus = workorderStatusService
+                        .lambdaQuery()
+                        .list();
+                for (WorkorderStatus status : workorderStatus) {
+                    if(workorderTemplate.getStatusId().equals(status.getId())){
+                        workorderTemplate.setStatusDescribe(status.getName());
+                        break;
+                    }
                 }
             }
-        }
 
 
-        return Result.OK("工单详情！", workorderTemplate);
+            return Result.OK("工单详情！", workorderTemplate);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("工单详情！", workorderTemplate);
+        }
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -43,76 +43,39 @@ public class UserServiceImpl implements UserService {
     //查询用户列表
     @Override
     public Result<?> queryUserList(String name, PageBean pageBean) {
+        try{
+            //分页
+            Page<WorkorderUser> page = new Page<WorkorderUser>(pageBean.getPageNo(), pageBean.getPageSize());
+            LambdaQueryChainWrapper<WorkorderUser> query = workorderUserService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotEmpty(name)){
+                //用户姓名
+                query.like(WorkorderUser::getName, name);
+            }
 
-        //分页
-        Page<WorkorderUser> page = new Page<WorkorderUser>(pageBean.getPageNo(), pageBean.getPageSize());
-        LambdaQueryChainWrapper<WorkorderUser> query = workorderUserService
-                .lambdaQuery();
+            //获取用户信息
+            Page<WorkorderUser> pageList = query.page(page);
 
-        //组装查询条件
-        if(StringUtils.isNotEmpty(name)){
-            //用户姓名
-            query.like(WorkorderUser::getName, name);
+            return Result.OK("用户信息列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("用户信息列表", null);
         }
-
-        //获取用户信息
-        Page<WorkorderUser> pageList = query.page(page);
-
-        return Result.OK("用户信息列表", pageList);
     }
 
     //用户信息-根据id查询用户信息
     @Override
     public Result<?> queryUserById(String userId) {
-        //查询公告信息详情
-        WorkorderUser user = workorderUserService
-                .lambdaQuery()
-                .eq(WorkorderUser::getId, userId)
-                .one();
-
-        //获取用户角色信息
-        WorkorderRole role = workorderRoleService
-                .lambdaQuery()
-                .eq(WorkorderRole::getId, user.getRoleId())
-                .one();
-        user.setRoleName(role.getName());
-
-        //获取角色权限信息
-        //1、获取权限信息
-        List<WorkorderPermission> permissionList = workorderPermissionService
-                .lambdaQuery()
-                .list();
-        //2、获取角色关联权限
-        List<WorkorderPermissionRole> permissionRoleList = workorderPermissionRoleService
-                .lambdaQuery()
-                .eq(WorkorderPermissionRole::getRoleId, role.getId())
-                .list();
-
-        //添加权限名称
-        for (WorkorderPermissionRole workorderPermissionRole : permissionRoleList) {
-            for (WorkorderPermission permission : permissionList) {
-                if(workorderPermissionRole.getPermissionId().equals(permission.getId())){
-                    workorderPermissionRole.setPermissionName(permission.getName());
-                }
-            }
-        }
-        user.setPermissionRoleList(permissionRoleList);
-
-        return Result.OK("用户信息详情", user);
-
-    }
+        WorkorderUser user = new WorkorderUser();
+        try{
+            //查询公告信息详情
+            user = workorderUserService
+                    .lambdaQuery()
+                    .eq(WorkorderUser::getId, userId)
+                    .one();
 
-    //登录
-    @Override
-    public Result<?> login(String userName, String password) {
-        //查询用户信息详情
-        WorkorderUser user = workorderUserService
-                .lambdaQuery()
-                .eq(WorkorderUser::getName, userName)
-                .eq(WorkorderUser::getPassword, password)
-                .one();
-
-        if(null != user){
             //获取用户角色信息
             WorkorderRole role = workorderRoleService
                     .lambdaQuery()
@@ -141,9 +104,62 @@ public class UserServiceImpl implements UserService {
             }
             user.setPermissionRoleList(permissionRoleList);
 
-            return Result.OK("用户登录成功", user);
-        }else {
-            return Result.error("该用户不存在", user);
+            return Result.OK("用户信息详情", user);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("用户信息详情获取失败", user);
+        }
+
+    }
+
+    //登录
+    @Override
+    public Result<?> login(String userName, String password) {
+        WorkorderUser user = new WorkorderUser();
+        try{
+            //查询用户信息详情
+            user = workorderUserService
+                    .lambdaQuery()
+                    .eq(WorkorderUser::getName, userName)
+                    .eq(WorkorderUser::getPassword, password)
+                    .one();
+
+            if(null != user){
+                //获取用户角色信息
+                WorkorderRole role = workorderRoleService
+                        .lambdaQuery()
+                        .eq(WorkorderRole::getId, user.getRoleId())
+                        .one();
+                user.setRoleName(role.getName());
+
+                //获取角色权限信息
+                //1、获取权限信息
+                List<WorkorderPermission> permissionList = workorderPermissionService
+                        .lambdaQuery()
+                        .list();
+                //2、获取角色关联权限
+                List<WorkorderPermissionRole> permissionRoleList = workorderPermissionRoleService
+                        .lambdaQuery()
+                        .eq(WorkorderPermissionRole::getRoleId, role.getId())
+                        .list();
+
+                //添加权限名称
+                for (WorkorderPermissionRole workorderPermissionRole : permissionRoleList) {
+                    for (WorkorderPermission permission : permissionList) {
+                        if(workorderPermissionRole.getPermissionId().equals(permission.getId())){
+                            workorderPermissionRole.setPermissionName(permission.getName());
+                        }
+                    }
+                }
+                user.setPermissionRoleList(permissionRoleList);
+
+                return Result.OK("用户登录成功", user);
+            }else {
+                return Result.error("该用户不存在", user);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("登录失败", user);
         }
 
     }
@@ -152,20 +168,25 @@ public class UserServiceImpl implements UserService {
     @Override
     public Result<?> register(WorkorderUser workorderUser) {
 
-        //查询是否有同名用户(不能注册同名用户)
-        WorkorderUser one = workorderUserService
-                .lambdaQuery()
-                .eq(WorkorderUser::getName, workorderUser.getName())
-                .one();
+        try{
+            //查询是否有同名用户(不能注册同名用户)
+            WorkorderUser one = workorderUserService
+                    .lambdaQuery()
+                    .eq(WorkorderUser::getName, workorderUser.getName())
+                    .one();
 
-        if(null != one){
-            return Result.error("用户名已存在！");
-        }
+            if(null != one){
+                return Result.error("用户名已存在！");
+            }
 
-        boolean flag = workorderUserService.save(workorderUser);
-        if(flag){
-            return Result.OK("注册成功！");
-        }else {
+            boolean flag = workorderUserService.save(workorderUser);
+            if(flag){
+                return Result.OK("注册成功！");
+            }else {
+                return Result.error("注册失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("注册失败！");
         }
     }
@@ -173,10 +194,15 @@ public class UserServiceImpl implements UserService {
     //修改用户信息
     @Override
     public Result<?> updateUser(WorkorderUser workorderUser) {
-        boolean flag = workorderUserService.updateById(workorderUser);
-        if(flag){
-            return Result.OK("修改用户信息成功！");
-        }else {
+        try{
+            boolean flag = workorderUserService.updateById(workorderUser);
+            if(flag){
+                return Result.OK("修改用户信息成功！");
+            }else {
+                return Result.error("修改用户信息失败！");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
             return Result.error("修改用户信息失败！");
         }
     }