diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java index 803a063..11e45c7 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java @@ -15,6 +15,7 @@ import com.chinagas.modules.schsf.domain.McBasicCmty; import com.chinagas.modules.schsf.domain.McBasicMoney; import com.chinagas.modules.schsf.domain.vo.McBasicMoneyVo; import com.chinagas.modules.schsf.service.IMcBasicMoneyService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,6 +38,7 @@ import java.util.stream.Collectors; * @author cw * @date 2024-05-23 */ +@Slf4j @RestController @RequestMapping("/mcBasicMoney") public class McBasicMoneyController extends BaseController { @@ -84,6 +86,7 @@ public class McBasicMoneyController extends BaseController { .sheet(0) // 导入数据的sheet页编号，0代表第一个sheet页，如果不填，则会导入所有sheet页的数据 .headRowNumber(4) // 列表头行数，1代表列表头有1行，第二行开始为数据行 .doReadSync(); // 开始读Excel，返回一个List集合，继续后续入库操作 + log.info("导入基础数据-金额总条数:{}", list == null ? 0 : list.size()); // // 检验重复数据 // Map> collect = list.stream().collect(Collectors.groupingBy(o -> @@ -102,6 +105,7 @@ public class McBasicMoneyController extends BaseController { // if (strings.size() < list.size()) { // throw new RuntimeException("表格中存在重复的数据"); // } + long startTime = System.currentTimeMillis(); // 记录任务开始时间 // 插入数据库 if (CollectionUtils.isNotEmpty(list)) { Runnable task = () -> { @@ -113,7 +117,16 @@ public class McBasicMoneyController extends BaseController { Thread backgroundThread = new Thread(task, "后台插入任务线程"); backgroundThread.setDaemon(true); // 设置为守护线程，随主线程结束而结束 backgroundThread.start(); + try { + backgroundThread.join(); // 等待线程执行完毕，确保能准确计算运行时长 + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); // 恢复中断状态 + log.error("导入基础数据-户数，等待线程执行完毕时被中断", e); + } } + long endTime = System.currentTimeMillis(); // 记录任务结束时间 + long duration = endTime - startTime; // 计算任务运行时长 + log.info("导入基础数据-金额，数据库插入任务运行时长：{}毫秒", duration); } catch (Exception e) { Throwable cause = e.getCause(); if (cause instanceof SQLIntegrityConstraintViolationException) { diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java index 898cbf6..1626389 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java @@ -16,6 +16,7 @@ import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo; import com.chinagas.modules.schsf.domain.vo.McVisitVo; import com.chinagas.modules.schsf.enums.YesNoEnums; import com.chinagas.modules.schsf.service.IMcVisitService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,6 +30,7 @@ import java.util.List; * @author cw * @date 2024-05-30 */ +@Slf4j @RestController @RequestMapping("/mcVisit") public class McVisitController extends BaseController { diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java index a299a19..c07d1ad 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java @@ -190,7 +190,7 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { mcIgnition_new.setCnfPersonId(userId); mcIgnition_new.setCnfPersonAccount(userAccount); mcIgnition_new.setCnfPersonName(userName); - mcIgnition_new.setUserCode(StringUtils.isEmpty(mcIgnition_old.getUserCity())?mcIgnitionMaintenanceVo.getUserCode():mcIgnition_old.getUserCity()); + mcIgnition_new.setUserCode(StringUtils.isEmpty(mcIgnition_old.getUserCode())?mcIgnitionMaintenanceVo.getUserCode():mcIgnition_old.getUserCode()); int i = mcIgnitionMapper.updateMcIgnition(mcIgnition_new); //1:添加记录 iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionMaintenanceVo.getId(), "schsf:mcIgnition:maintenance", diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java index 05b8da0..ad3d860 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java @@ -24,6 +24,7 @@ import com.chinagas.modules.schsf.service.IMcIgnitionService; import com.chinagas.modules.schsf.service.IMcOperationLogService; import com.chinagas.modules.schsf.service.IMcVisitService; import com.chinagas.modules.schsf.stateMachine.StateMachineNext; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +47,7 @@ import java.util.concurrent.atomic.AtomicInteger; * @date 2024-05-30 */ +@Slf4j @Service public class McVisitServiceImpl implements IMcVisitService { private static final Logger log = LoggerFactory.getLogger(McVisitServiceImpl.class); @@ -139,6 +141,7 @@ public class McVisitServiceImpl implements IMcVisitService { @Transactional @Override public int insertMcVisit(McVisit mcVisit) { + log.info("拜访工单-新增拜访工单，参数对象:{}", mcVisit); List mcBasicCmties = iMcBasicCmtyService.selectVisitDeptList(mcVisit); if (mcBasicCmties==null || mcBasicCmties.size()==0){ throw new ServiceException("选择的组织不存在！"); @@ -158,12 +161,16 @@ public class McVisitServiceImpl implements IMcVisitService { mcVisit.setUpdateBy(userId); //获取工单号 mcVisit.setTicketNumber(getTicketNumber()); + + log.info("拜访工单-新增拜访工单，获取工单号:{}", mcVisit.getTicketNumber()); //工单类型 mcVisit.setTicketType(getTicketType(mcVisit.getIsCharged(), mcVisit.getIsVisited())); + log.info("拜访工单-新增拜访工单，工单类型:{}", mcVisit.getTicketType()); //状态获取 getStatusNodeInfo(mcVisit, VisitlsEventEnums.PUBLISH); //收费验证 isChargedValidate(mcVisit); + log.info("拜访工单-新增拜访工单，添加工单实体:{}", mcVisit); int i = mcVisitMapper.insertMcVisit(mcVisit); if (i > 0) { if (StringUtils.isNotEmpty(mcVisit.getFieldPhotoFile())) { -- libgit2 0.21.2