两个规定-一键提交修改

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -11,12 +11,28 @@ import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.ESPlanTaskList;
 import com.yeejoin.amos.patrol.business.dao.repository.ICheckInputDao;
-import com.yeejoin.amos.patrol.business.dto.*;
+import com.yeejoin.amos.patrol.business.dto.CheckDto;
+import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskAlarmInfoVo;
+import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskDetailVo;
+import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskEquipInfoVo;
+import com.yeejoin.amos.patrol.business.dto.TopicEntityVo;
 import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
 import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
-import com.yeejoin.amos.patrol.business.service.intfc.*;
-import com.yeejoin.amos.patrol.business.util.*;
+import com.yeejoin.amos.patrol.business.service.intfc.ICheckService;
+import com.yeejoin.amos.patrol.business.service.intfc.IMessageService;
+import com.yeejoin.amos.patrol.business.service.intfc.IPlanTaskService;
+import com.yeejoin.amos.patrol.business.service.intfc.IPointService;
+import com.yeejoin.amos.patrol.business.service.intfc.ISafety3DDataSendService;
+import com.yeejoin.amos.patrol.business.util.CheckPageParamUtil;
+import com.yeejoin.amos.patrol.business.util.CheckParamUtil;
+import com.yeejoin.amos.patrol.business.util.CommonResponse;
+import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
+import com.yeejoin.amos.patrol.business.util.DaoCriteria;
+import com.yeejoin.amos.patrol.business.util.FileHelper;
+import com.yeejoin.amos.patrol.business.util.ResponseHelperUtil;
+import com.yeejoin.amos.patrol.business.util.Toke;
+import com.yeejoin.amos.patrol.business.util.ToolUtils;
 import com.yeejoin.amos.patrol.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.patrol.business.vo.CheckInfoVo;
 import com.yeejoin.amos.patrol.common.enums.PlanTaskFinishStatusEnum;
@@ -44,11 +60,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.util.StopWatch;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -56,13 +76,23 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.*;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/api/check")
@@ -585,10 +615,14 @@ public class CheckController extends AbstractBaseController {
             @RequestParam(required = false) String checkTime,
             @RequestParam(required = true) String type) {
         try {
+            StopWatch stopWatch = new StopWatch();
+            stopWatch.start();
             String userId = RequestContext.getExeUserId();
             ReginParams reginParams = getSelectedOrgInfo();
 
-             String loginOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+            String loginOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+            stopWatch.stop();
+            log.info("获取巡检日历数据=====> loginOrgCode time: {}", stopWatch.getTotalTimeSeconds());
             if(StringUtils.isBlank(checkTime)) {
                 if(type.equals(String.valueOf(PlanTaskTypeStatusEnum.month.getValue()))) {
                     checkTime = DateUtils.dateFormat(new Date(), DateUtils.YEAR_PATTERN);
@@ -596,8 +630,10 @@ public class CheckController extends AbstractBaseController {
                     checkTime = DateUtils.dateFormat(new Date(), DateUtils.MONTH_PATTERN);
                 }
             }
-
+            stopWatch.start();
             Map<String, Object> map = checkService.checkCalendarNew(checkTime,loginOrgCode,String.valueOf(PlanTaskTypeStatusEnum.getValue(type)),userId);
+            stopWatch.stop();
+            log.info("获取巡检日历数据=====> sql map time: {}", stopWatch.getTotalTimeSeconds());
             return ResponseHelper.buildResponse(map);
         } catch (Exception e) {
             e.printStackTrace();

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -14,8 +13,23 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.patrol.business.bo.PlanTaskSyncBo;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
-import com.yeejoin.amos.patrol.business.dao.mapper.*;
-import com.yeejoin.amos.patrol.business.dao.repository.*;
+import com.yeejoin.amos.patrol.business.dao.mapper.CheckInputMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.MsgMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
+import com.yeejoin.amos.patrol.business.dao.repository.ESPlanTaskList;
+import com.yeejoin.amos.patrol.business.dao.repository.ESTaskDetail;
+import com.yeejoin.amos.patrol.business.dao.repository.ICheckDao;
+import com.yeejoin.amos.patrol.business.dao.repository.ICheckInputDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IMsgDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDetailDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
+import com.yeejoin.amos.patrol.business.dao.repository.ITaskDao;
+import com.yeejoin.amos.patrol.business.dao.repository.ITaskFeedbackDao;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PlanTaskPointInputItemBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PointCheckDetailBo;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
@@ -25,22 +39,33 @@ import com.yeejoin.amos.patrol.business.service.intfc.IMessageService;
 import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService;
 import com.yeejoin.amos.patrol.business.service.intfc.IPlanService;
 import com.yeejoin.amos.patrol.business.util.DateUtil;
-import com.yeejoin.amos.patrol.business.util.Toke;
-import com.yeejoin.amos.patrol.common.enums.*;
+import com.yeejoin.amos.patrol.common.enums.CheckStatusEnum;
+import com.yeejoin.amos.patrol.common.enums.PlanTaskDetailIsFinishEnum;
+import com.yeejoin.amos.patrol.common.enums.PlanTaskDetailStatusEnum;
+import com.yeejoin.amos.patrol.common.enums.PlanTaskFinishStatusEnum;
+import com.yeejoin.amos.patrol.common.enums.TaskStatusEnum;
 import com.yeejoin.amos.patrol.core.async.AsyncTask;
 import com.yeejoin.amos.patrol.core.common.response.AppCheckInputRespone;
 import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
-import com.yeejoin.amos.patrol.dao.entity.*;
+import com.yeejoin.amos.patrol.dao.entity.Check;
+import com.yeejoin.amos.patrol.dao.entity.CheckInput;
+import com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto;
+import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
+import com.yeejoin.amos.patrol.dao.entity.InputItem;
+import com.yeejoin.amos.patrol.dao.entity.Msg;
+import com.yeejoin.amos.patrol.dao.entity.Plan;
+import com.yeejoin.amos.patrol.dao.entity.PlanTask;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
+import com.yeejoin.amos.patrol.dao.entity.Task;
+import com.yeejoin.amos.patrol.dao.entity.TaskFeedback;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.mqtt.WebMqttComponent;
-import liquibase.pro.packaged.S;
 import org.quartz.Job;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,8 +75,15 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.alibaba.fastjson.JSON.toJSONString;