Merge remote-tracking branch 'origin/master'

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquWarrantyProviderServiceImpl.java

@@ -162,6 +162,7 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
                 equWarrantyProviderDo.setManagedepartmentid(deptId);
                 equWarrantyProviderDo.setManagedepartment(dept);
                 equWarrantyProviderDo.setEnablestate("10");
+                equWarrantyProviderDo.setClassify("10");
                 equWarrantyProviderDos.add(equWarrantyProviderDo);
                 if(StringUtil.isNotBlank(stringBuilder)){
                     stringBuilder.append("<br>");

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspSafetyProductObjectiveDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.rongwe.scentity.domian.AspSafetyProductObjective;
+import com.rongwei.rwcommon.base.BaseDao;
+
+public interface AspSafetyProductObjectiveDao extends BaseDao<AspSafetyProductObjective> {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspSafetyProductObjectiveResultDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResult;
+import com.rongwei.rwcommon.base.BaseDao;
+
+public interface AspSafetyProductObjectiveResultDao extends BaseDao<AspSafetyProductObjectiveResult> {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspSafetyProductObjectiveResultScoreDetailDao.java

@@ -0,0 +1,8 @@
+package com.rongwei.sfcommon.sys.dao;
+
+
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResultScoreDetail;
+import com.rongwei.rwcommon.base.BaseDao;
+
+public interface AspSafetyProductObjectiveResultScoreDetailDao extends BaseDao<AspSafetyProductObjectiveResultScoreDetail> {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspSafetyProductObjectiveScoreDetailDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveScoreDetail;
+import com.rongwei.rwcommon.base.BaseDao;
+
+public interface AspSafetyProductObjectiveScoreDetailDao extends BaseDao<AspSafetyProductObjectiveScoreDetail> {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/AspSafetyProductObjectiveResultScoreDetailService.java

@@ -0,0 +1,8 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspSafetyProductObjective;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResultScoreDetail;
+
+public interface AspSafetyProductObjectiveResultScoreDetailService extends IService<AspSafetyProductObjectiveResultScoreDetail> {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/AspSafetyProductObjectiveResultService.java

@@ -0,0 +1,8 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspSafetyProductObjective;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResult;
+
+public interface AspSafetyProductObjectiveResultService extends IService<AspSafetyProductObjectiveResult> {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/AspSafetyProductObjectiveScoreDetailService.java

@@ -0,0 +1,8 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspSafetyProductObjective;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveScoreDetail;
+
+public interface AspSafetyProductObjectiveScoreDetailService extends IService<AspSafetyProductObjectiveScoreDetail> {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/AspSafetyProductObjectiveService.java

@@ -0,0 +1,9 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspSafetyProductObjective;
+
+public interface AspSafetyProductObjectiveService extends IService<AspSafetyProductObjective> {
+    void safetyResult();
+
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyProductObjectiveResultScoreDetailServiceImpl.java

@@ -0,0 +1,15 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResultScoreDetail;
+import com.rongwei.sfcommon.sys.dao.AspSafetyProductObjectiveResultScoreDetailDao;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveResultScoreDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ：sc
+ * @since ：2023/12/7
+ */
+@Service
+public class AspSafetyProductObjectiveResultScoreDetailServiceImpl extends ServiceImpl<AspSafetyProductObjectiveResultScoreDetailDao, AspSafetyProductObjectiveResultScoreDetail> implements AspSafetyProductObjectiveResultScoreDetailService {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyProductObjectiveResultServiceImpl.java

@@ -0,0 +1,15 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResult;
+import com.rongwei.sfcommon.sys.dao.AspSafetyProductObjectiveResultDao;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveResultService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ：sc
+ * @since ：2023/12/7
+ */
+@Service
+public class AspSafetyProductObjectiveResultServiceImpl extends ServiceImpl<AspSafetyProductObjectiveResultDao, AspSafetyProductObjectiveResult> implements AspSafetyProductObjectiveResultService {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyProductObjectiveScoreDetailServiceImpl.java

@@ -0,0 +1,15 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveScoreDetail;
+import com.rongwei.sfcommon.sys.dao.AspSafetyProductObjectiveScoreDetailDao;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveScoreDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ：sc
+ * @since ：2023/12/7
+ */
+@Service
+public class AspSafetyProductObjectiveScoreDetailServiceImpl extends ServiceImpl<AspSafetyProductObjectiveScoreDetailDao, AspSafetyProductObjectiveScoreDetail> implements AspSafetyProductObjectiveScoreDetailService {
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyProductObjectiveServiceImpl.java

@@ -0,0 +1,109 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspSafetyProductObjective;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResult;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveResultScoreDetail;
+import com.rongwe.scentity.domian.AspSafetyProductObjectiveScoreDetail;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.sfcommon.sys.dao.AspSafetyProductObjectiveDao;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveResultScoreDetailService;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveResultService;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveScoreDetailService;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author ：sc
+ * @since ：2023/12/7
+ */
+@Service
+public class AspSafetyProductObjectiveServiceImpl extends ServiceImpl<AspSafetyProductObjectiveDao, AspSafetyProductObjective> implements AspSafetyProductObjectiveService {
+    @Autowired
+    private AspSafetyProductObjectiveScoreDetailService scoreDetailService;
+    @Autowired
+    private AspSafetyProductObjectiveResultService objectiveResultService;
+    @Autowired
+    private AspSafetyProductObjectiveResultScoreDetailService objectiveResultScoreDetailService;
+
+    @Override
+    public void safetyResult() {
+        //==============查询所有需要生成的目标
+        //获取当前季度(1,2,3,4)
+        int quarter = DateUtil.quarter(DateUtil.date());
+        //查询考核主表今年、当前季度，是否有已经生成的数据
+        List<AspSafetyProductObjectiveResult> aspSafetyProductObjectiveResults = objectiveResultService.getBaseMapper().selectList(new QueryWrapper<AspSafetyProductObjectiveResult>().lambda()
+                .like(AspSafetyProductObjectiveResult::getYear, DateUtil.thisYear())
+                .eq(AspSafetyProductObjectiveResult::getQuerter, quarter));
+        //获取mainID
+        List<String> hadMainIDList = aspSafetyProductObjectiveResults.stream().map(AspSafetyProductObjectiveResult::getMainid).collect(Collectors.toList());
+
+        //查询今年的所有目标数据
+        List<AspSafetyProductObjective> aspSafetyProductObjectiveList = this.baseMapper.selectList(new QueryWrapper<AspSafetyProductObjective>().lambda().like(AspSafetyProductObjective::getYear, DateUtil.thisYear()));
+        //过滤掉已经生成考核的数据
+        List<AspSafetyProductObjective> aspSafetyProductObjectives = aspSafetyProductObjectiveList.stream().filter(item -> !hadMainIDList.contains(item.getId())).collect(Collectors.toList());
+
+        //遍历目标获取所有目标的ID集合
+        List<String> collectIds = aspSafetyProductObjectives.stream().map(AspSafetyProductObjective::getId).collect(Collectors.toList());
+        if (ObjectUtil.isEmpty(collectIds)){
+            return;
+        }
+        //查询出所有目标的子表数据
+        List<AspSafetyProductObjectiveScoreDetail> scoreDetails = scoreDetailService.getBaseMapper().selectList(new QueryWrapper<AspSafetyProductObjectiveScoreDetail>().lambda().in(AspSafetyProductObjectiveScoreDetail::getMainid, collectIds));
+
+        //=============遍历目标组装考核模板数据
+        //考核主表
+        List<AspSafetyProductObjectiveResult> mainResList = new LinkedList<>();
+        //考核子表
+        List<AspSafetyProductObjectiveResultScoreDetail> childResList = new LinkedList<>();
+
+
+        aspSafetyProductObjectives.forEach(item -> {
+            //目标表主键
+            String id = item.getId();
+            //获取对应的目标子表
+            List<AspSafetyProductObjectiveScoreDetail> collectDetails = scoreDetails.stream().filter(item2 -> id.equals(item2.getMainid())).collect(Collectors.toList());
+            //转换目标主表
+            AspSafetyProductObjectiveResult aspSafetyProductObjectiveResult = BeanUtil.toBean(item, AspSafetyProductObjectiveResult.class);
+            //默认当前季度
+            aspSafetyProductObjectiveResult.setQuerter(String.valueOf(quarter));
+            //修改uuid
+            String newId = SecurityUtil.getUUID();
+            aspSafetyProductObjectiveResult.setId(newId);
+            //设置考核主表的mainID
+            aspSafetyProductObjectiveResult.setMainid(id);
+
+
+            //放入最终插入字段
+            mainResList.add(aspSafetyProductObjectiveResult);
+
+            collectDetails.forEach(item3 -> {
+                //转换考核子表
+                AspSafetyProductObjectiveResultScoreDetail detail = BeanUtil.toBean(item3, AspSafetyProductObjectiveResultScoreDetail.class);
+                //修改考核子表的ID
+                detail.setId(SecurityUtil.getUUID());
+                //修改考核子表的主表ID
+                detail.setMainid(newId);
+                //放入最终考核子表插入字段
+                childResList.add(detail);
+            });
+
+        });
+
+
+        //==============批量插入考核模板数据
+        //插入考核主表
+        objectiveResultService.saveBatch(mainResList);
+        //插入考核子表
+        objectiveResultScoreDetailService.saveBatch(childResList);
+    }
+}

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/domian/AspSafetyProductObjective.java

@@ -0,0 +1,126 @@
+package com.rongwe.scentity.domian;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * asp_safety_product_objective
+ * @author 
+ */
+@Data
+public class AspSafetyProductObjective extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+//    /**
+//     * 是否删除Y/N
+//     */
+//    private String deleted;
+//
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+//
+//    /**
+//     * 创建时间
+//     */
+//    private Date createdate;
+//
+//    /**
+//     * 创建用户ID
+//     */
+//    private String createuserid;
+//
+//    /**
+//     * 修改日期
+//     */
+//    private Date modifydate;
+//
+//    /**
+//     * 修改用户ID
+//     */
+//    private String modifyuserid;
+//
+//    /**
+//     * 创建人
+//     */
+//    private String createusername;
+//
+//    /**
+//     * 修改人
+//     */
+//    private String modifyusername;
+
+    /**
+     * 年度
+     */
+    private String year;
+
+    /**
+     * 单位名称
+     */
+    private String departname;
+
+    /**
+     * 单位ID
+     */
+    private String departid;
+
+    /**
+     * 指标级别
+     */
+    private String objectivelevel;
+
+    /**
+     * 考核频次
+     */
+    private String assenssmentfrequency;
+
+    /**
+     * 年度得分
+     */
+    private String annualscore;
+
+    /**
+     * 补充说明
+     */
+    private String explanation;
+
+    /**
+     * 附件
+     */
+    private String file;
+
+    /**
+     * 检查项所属区域ID
+     */
+    private String checkitemareaid;
+
+    /**
+     * 检查对象负责组织机构ID
+     */
+    private String chargeorgid;
+
+    /**
+     * 检查对象负责组织机构名称
+     */
+    private String chargeorgname;
+
+    private static final long serialVersionUID = 1L;
+}

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/domian/AspSafetyProductObjectiveResult.java

@@ -0,0 +1,141 @@
+package com.rongwe.scentity.domian;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * asp_safety_product_objective_result
+ * @author
+ */
+@Data
+public class AspSafetyProductObjectiveResult extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+//    /**
+//     * 是否删除Y/N
+//     */
+//    private String deleted;
+//
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+//
+//    /**
+//     * 创建时间
+//     */
+//    private Date createdate;
+//
+//    /**
+//     * 创建用户ID
+//     */
+//    private String createuserid;
+//
+//    /**
+//     * 修改日期
+//     */
+//    private Date modifydate;
+//
+//    /**
+//     * 修改用户ID
+//     */
+//    private String modifyuserid;
+//
+//    /**
+//     * 创建人
+//     */
+//    private String createusername;
+//
+//    /**
+//     * 修改人
+//     */
+//    private String modifyusername;
+
+    /**
+     * 主表ID
+     */
+    private String mainid;
+
+    /**
+     * 年度
+     */
+    private String year;
+
+    /**
+     * 单位名称
+     */
+    private String departname;
+
+    /**
+     * 单位ID
+     */
+    private String departid;
+
+    /**
+     * 指标级别
+     */
+    private String objectivelevel;
+
+    /**
+     * 考核频次
+     */
+    private String assenssmentfrequency;
+
+    /**
+     * 年度得分
+     */
+    private String annualscore;
+
+    /**
+     * 补充说明
+     */
+    private String explanation;
+
+    /**
+     * 附件
+     */
+    private String file;
+
+    /**
+     * 考核季度
+     */
+    private String querter;
+
+    /**
+     * 总得分
+     */
+    private String totalscore;
+
+    /**
+     * 监测负责人ID
+     */
+    private String headerid;
+
+    /**
+     * 监测负责人名称
+     */
+    private String headername;
+
+    /**
+     * 监测意见
+     */
+    private String opinoin;
+
+    private static final long serialVersionUID = 1L;
+}

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/domian/AspSafetyProductObjectiveResultScoreDetail.java

@@ -0,0 +1,111 @@
+package com.rongwe.scentity.domian;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * asp_safety_product_objective_result_score_detail
+ * @author
+ */
+@Data
+public class AspSafetyProductObjectiveResultScoreDetail extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+//    /**
+//     * 是否删除Y/N
+//     */
+//    private String deleted;
+//
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+//
+//    /**
+//     * 创建时间
+//     */
+//    private Date createdate;
+//
+//    /**
+//     * 创建用户ID
+//     */
+//    private String createuserid;
+//
+//    /**
+//     * 修改日期
+//     */
+//    private Date modifydate;
+//
+//    /**
+//     * 修改用户ID
+//     */
+//    private String modifyuserid;
+//
+//    /**
+//     * 创建人
+//     */
+//    private String createusername;
+//
+//    /**
+//     * 修改人
+//     */
+//    private String modifyusername;
+
+    /**
+     * 主表ID
+     */
+    private String mainid;
+
+    /**
+     * 目标与指标分解
+     */
+    private String name;
+
+    /**
+     * 控制措施及计划
+     */
+    private String todo;
+
+    /**
+     * 目标绩效考核标准
+     */
+    private String rule;
+
+    /**
+     * 完成情况
+     */
+    private String result;
+
+    /**
+     * 改进说明
+     */
+    private String explanation;
+
+    /**
+     * 得分
+     */
+    private String score;
+
+    /**
+     * 扣分说明
+     */
+    private String deductionexplantion;
+
+    private static final long serialVersionUID = 1L;
+}

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/domian/AspSafetyProductObjectiveScoreDetail.java

@@ -0,0 +1,111 @@
+package com.rongwe.scentity.domian;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * asp_safety_product_objective_score_detail
+ * @author
+ */
+@Data
+public class AspSafetyProductObjectiveScoreDetail extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+//    /**
+//     * 是否删除Y/N
+//     */
+//    private String deleted;
+//
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+//
+//    /**
+//     * 创建时间
+//     */
+//    private Date createdate;
+//
+//    /**
+//     * 创建用户ID
+//     */
+//    private String createuserid;
+//
+//    /**
+//     * 修改日期
+//     */
+//    private Date modifydate;
+//
+//    /**
+//     * 修改用户ID
+//     */
+//    private String modifyuserid;
+//
+//    /**
+//     * 创建人
+//     */
+//    private String createusername;
+//
+//    /**
+//     * 修改人
+//     */
+//    private String modifyusername;
+
+    /**
+     * 主表ID
+     */
+    private String mainid;
+
+    /**
+     * 目标与指标分解
+     */
+    private String name;
+
+    /**
+     * 控制措施及计划
+     */
+    private String todo;
+
+    /**
+     * 目标绩效考核标准
+     */
+    private String rule;
+
+    /**
+     * 完成情况
+     */
+    private String result;
+
+    /**
+     * 改进说明
+     */
+    private String explanation;
+
+    /**
+     * 得分
+     */
+    private String score;
+
+    /**
+     * 扣分说明
+     */
+    private String deductionexplantion;
+
+    private static final long serialVersionUID = 1L;
+}

cx-safe-check/cx-save-check-server/src/main/java/com/rongwei/savecheck/controller/AspSafetyProductObjectiveController.java

@@ -0,0 +1,43 @@
+package com.rongwei.savecheck.controller;
+
+
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.StringUtils;
+import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 安全生产目标
+ *
+ * @author sc
+ * @date 2023-12-07
+ */
+@RestController
+@RequestMapping("aspSafetyProductObjective")
+@Slf4j
+public class AspSafetyProductObjectiveController {
+    @Autowired
+    private AspSafetyProductObjectiveService aspSafetyProductObjectiveService;
+
+    /**
+     * 安全生产目标定时任务（按季度生成指标的考核结果模板）
+     * @return
+     */
+    @PostMapping("/safetyResult")
+    public R safetyResult (){
+        try{
+            aspSafetyProductObjectiveService.safetyResult();
+            return R.ok();
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(StringUtils.spliceErrorMsg(e), e.fillInStackTrace());
+            return R.error();
+        }
+    }
+
+}