修改bug

msss-gis/src/main/java/com/tofly/xrtygis/service/callCenter/service/impl/PltCalllist1000ServiceImpl.java

@@ -81,19 +81,19 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
                 //无人接听就不用筛选是否评分情况
 //                .isNull(StringUtil.isNull(callState) , PltCalllist1000::getIsGrade)
                 //必须是通话；如果callState=2；代表无人接听
-                .isNotNull(StringUtil.isNull(callState),PltCalllist1000::getEmpcode)
+                .isNotNull(StringUtil.isNull(callState), PltCalllist1000::getEmpcode)
                 .isNotNull(PltCalllist1000::getEmpcode)
-                .ne(PltCalllist1000::getEmpcode,"")
+                .ne(PltCalllist1000::getEmpcode, "")
                 .eq(StringUtil.isNotEmpty(sysphone), PltCalllist1000::getSysphone, sysphone)
                 .eq(StringUtil.isNotEmpty(empCode), PltCalllist1000::getEmpcode, empCode)
                 .eq(StringUtil.isNotNull(callType), PltCalllist1000::getCallType, callType)
-                .le(StringUtil.isNotNull(endTime) , PltCalllist1000::getCallTime , endTime)
-                .ge(StringUtil.isNotNull(startTime) , PltCalllist1000::getCallTime , startTime)
-                .eq(StringUtil.isNotNull(callState) , PltCalllist1000::getCallResult , callState)
+                .le(StringUtil.isNotNull(endTime), PltCalllist1000::getCallTime, endTime)
+                .ge(StringUtil.isNotNull(startTime), PltCalllist1000::getCallTime, startTime)
+                .eq(StringUtil.isNotNull(callState), PltCalllist1000::getCallResult, callState)
                 .select(PltCalllist1000::getId, PltCalllist1000::getConnectionid, PltCalllist1000::getCallType, PltCalllist1000::getTelephone, PltCalllist1000::getSysphone,
                         PltCalllist1000::getCallTime, PltCalllist1000::getConnectTime, PltCalllist1000::getQueueTime, PltCalllist1000::getGetfreeTime, PltCalllist1000::getHangupTime,
                         PltCalllist1000::getTimes, PltCalllist1000::getAgentFirstringTime, PltCalllist1000::getAgentFirstconnectTime,
-                        PltCalllist1000::getCallResult, PltCalllist1000::getEmpcode, PltCalllist1000::getDeptid , PltCalllist1000::getRecordFile)
+                        PltCalllist1000::getCallResult, PltCalllist1000::getEmpcode, PltCalllist1000::getDeptid, PltCalllist1000::getRecordFile)
                 .orderByDesc(PltCalllist1000::getId));
 
         List<PltCalllist1000> pltCalllistList = pltCalllistIPage.getRecords();
@@ -117,23 +117,23 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
             Map<Long, String> map = newHotlineService.gerDeptNameMap().stream().collect(Collectors.toMap(UserDeptHotlineVo::getDeptId, UserDeptHotlineVo::getDeptName, (key1, key2) -> key2));
 
             final List<UserDeptHotlineVo> realNameMap1 = newHotlineService.getRealNameMap();
-            log.info("获取真实姓名"+ JSON.toJSONString(realNameMap1));
+            log.info("获取真实姓名" + JSON.toJSONString(realNameMap1));
             Map<String, String> realNameMap = realNameMap1.stream().collect(Collectors.toMap(UserDeptHotlineVo::getUserCode, UserDeptHotlineVo::getUserName, (key1, key2) -> key2));
             pltCalllistList.forEach(k -> {
                 //编码替换成中文
                 if (StringUtil.isNotEmpty(k.getDeptid())) {
-                    if(k.getDeptid()!=null){
+                    if (k.getDeptid() != null) {
                         String deptName = map.get(Long.parseLong(k.getDeptid()));
-                        if(!StringUtils.isEmpty(deptName)){
+                        if (!StringUtils.isEmpty(deptName)) {
                             k.setDeptName(deptName);
                         }
 
                     }
 
                 }
-                if(StringUtil.isNotEmpty(k.getEmpcode())){
+                if (StringUtil.isNotEmpty(k.getEmpcode())) {
                     String userName = realNameMap.get(k.getEmpcode());
-                    if(!StringUtils.isEmpty(userName)){
+                    if (!StringUtils.isEmpty(userName)) {
                         k.setEmpName(userName);
                     }
                 }
@@ -179,7 +179,7 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
      */
     @Override
     public List<Map<String, Object>> missedCalls(MissedCallsDto dto) {
-        if (!StringUtils.isEmpty(dto.getPhoneNumber())){
+        if (!StringUtils.isEmpty(dto.getPhoneNumber())) {
             String s = "'%" + dto.getPhoneNumber() + "%'";
             dto.setPhoneNumber(s);
         }
@@ -192,15 +192,15 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
      * @return map
      */
     @Override
-    public Map<String,Long> getCallInCount() {
-        FlowNum entry = null; //baseMapper.getFlowNum();
-
+    public Map<String, Long> getCallInCount() {
+        //FlowNum entry = null;
+        FlowNum entry = baseMapper.getFlowNum();
         Long flowNum = 0L;
         Long blockCallNum = 0L;
-       if (entry!=null){
-            flowNum= entry.getFlowNum();
+        if (entry != null) {
+            flowNum = entry.getFlowNum();
 
-            blockCallNum= entry.getBlockCallNum();
+            blockCallNum = entry.getBlockCallNum();
         }
         //获取当天时间
         String currentDay = DateUtil.parseDateToStr("yyyy-MM-dd", Date8Util.getCurrentDate());
@@ -208,31 +208,32 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
         Long count = baseMapper.getCallInCount(currentDay);
         Long notCallInCount = baseMapper.getNotCallInCount(currentDay);
         //如果当天流量超过设定的流量预警数，则创建一条应急记录
-        if (count > flowNum){
+        if (count > flowNum) {
             saveEmerSys(flowNum);
         }
-        if (notCallInCount > blockCallNum){
+        if (notCallInCount > blockCallNum) {
             saveEmerSys2(blockCallNum);
         }
-        Map<String,Long> map = new HashMap<>();
-        map.put("flowNum",flowNum);
-        map.put("blockCallNum",blockCallNum);
-        map.put("inbound",count);
-        map.put("notCall",notCallInCount);
+        Map<String, Long> map = new HashMap<>();
+        map.put("flowNum", flowNum);
+        map.put("blockCallNum", blockCallNum);
+        map.put("inbound", count);
+        map.put("notCall", notCallInCount);
         return map;
     }
 
     /**
      * 异步执行创建应急记录
      * 这个不用及时创建，因为前端11S请求一次
+     *
      * @param flowNum
      */
     @Async
-    public void saveEmerSys(Long flowNum){
+    public void saveEmerSys(Long flowNum) {
         emergencyService.saveEmerSys(flowNum);
     }
 
-    public void saveEmerSys2(Long blockCallNum){
+    public void saveEmerSys2(Long blockCallNum) {
         emergencyService.saveEmerSys2(blockCallNum);
     }
 
@@ -260,19 +261,19 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
     }
 
     @Override
-    public IPage<Map> getTelephoneSta(HttpServletResponse response,Page page, CallSearch search) {
+    public IPage<Map> getTelephoneSta(HttpServletResponse response, Page page, CallSearch search) {
         IPage<Map> telephoneSta = baseMapper.getTelephoneSta(page, search);
-        if (search.getExport() == 1){
-            exportCommonCodeService.exportCode(response,"telephoneStaService",telephoneSta.getRecords());
+        if (search.getExport() == 1) {
+            exportCommonCodeService.exportCode(response, "telephoneStaService", telephoneSta.getRecords());
         }
         return telephoneSta;
     }
 
     @Override
-    public IPage<Map> getSatisfactionStatis(HttpServletResponse response,Page page, CallSearch search) {
+    public IPage<Map> getSatisfactionStatis(HttpServletResponse response, Page page, CallSearch search) {
         IPage<Map> satisfactionStatis = baseMapper.getSatisfactionStatis(page, search);
-        if (search.getExport() == 1){
-            exportCommonCodeService.exportCode(response,"satisfactionStatisService",satisfactionStatis.getRecords());
+        if (search.getExport() == 1) {
+            exportCommonCodeService.exportCode(response, "satisfactionStatisService", satisfactionStatis.getRecords());
         }
         return satisfactionStatis;
     }
@@ -281,17 +282,17 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
     public IPage<Map> getSatisfactionStatisInfo(HttpServletResponse response, Page page, CallSearch search) {
         IPage<Map> satisfactionStatisInfo = baseMapper.getSatisfactionStatisInfo(page, search);
         Long export = search.getExport();
-        if (export == 1){
-            exportCommonCodeService.exportCode(response,"",baseMapper.getSatisfactionStatisInfo(search));
+        if (export == 1) {
+            exportCommonCodeService.exportCode(response, "", baseMapper.getSatisfactionStatisInfo(search));
         }
         return satisfactionStatisInfo;
     }
 
     @Override
-    public IPage<Map> getStateStatis(HttpServletResponse response,Page page, CallSearch search) {
+    public IPage<Map> getStateStatis(HttpServletResponse response, Page page, CallSearch search) {
         IPage<Map> stateStatis = baseMapper.getStateStatis(page, search);
-        if (search.getExport() == 1){
-            exportCommonCodeService.exportCode(response,"stateStatisService",stateStatis.getRecords());
+        if (search.getExport() == 1) {
+            exportCommonCodeService.exportCode(response, "stateStatisService", stateStatis.getRecords());
         }
         return stateStatis;
     }
@@ -309,8 +310,8 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
     @Override
     public Map<String, List<Map>> getTodayFlow() {
         Map<String, List<Map>> map = new HashMap<>();
-        map.put("hrl",baseMapper.getInboundVolume());
-        map.put("hcl",baseMapper.getOutboundVolume());
+        map.put("hrl", baseMapper.getInboundVolume());
+        map.put("hcl", baseMapper.getOutboundVolume());
         return map;
     }
 
@@ -321,7 +322,7 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
      */
     @Override
     public Map<String, Long> incomingCallCount() {
-        return baseMapper.incomingCallCount(STAER_DATE,END_DATE);
+        return baseMapper.incomingCallCount(STAER_DATE, END_DATE);
     }
 
     /**
@@ -331,7 +332,7 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
      */
     @Override
     public Map<String, Long> exhalationCount() {
-        return baseMapper.exhalationCount(STAER_DATE,END_DATE);
+        return baseMapper.exhalationCount(STAER_DATE, END_DATE);
 
     }
 
@@ -343,12 +344,12 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
      */
     @Override
     public Map<String, Long> getCallCount(String userName) {
-        return baseMapper.getCallCount(STAER_DATE,END_DATE,userName);
+        return baseMapper.getCallCount(STAER_DATE, END_DATE, userName);
     }
 
     @Override
-    public Map<String, BigDecimal> getUserScoreInfo( Date start,Date end,String userName) {
-        return baseMapper.getUserScoreInfo(start,end,userName);
+    public Map<String, BigDecimal> getUserScoreInfo(Date start, Date end, String userName) {
+        return baseMapper.getUserScoreInfo(start, end, userName);
     }
 
     @Override

msss-gis/src/main/resources/mapper/common/TfIndexAllocationMapper.xml

@@ -64,7 +64,7 @@
     <select id="getReportLevel" resultType="string">
         SELECT REPORT_LEVEL
         FROM TF_SCADA_REPORT
-        WHERE ID = #{reportId}
+        WHERE ID = #{reportId} and is_del=0
     </select>
                                                                                             
 </mapper>

msss-gps/msss-gps-boot/src/main/java/com/tofly/gpsboot/service/audit/impl/AuditHiddenTroubleServiceImpl.java

@@ -92,7 +92,7 @@ public class AuditHiddenTroubleServiceImpl implements IAuditHiddenTroubleServer
         // 当前审批类型为月计划 审核通过发布任务
         if (AuditSateEnum.AUDIT_YES.getCode().equals(auditResult) && IsRespectEnum.IS_RESPECT_YES.getCode().equals(isrespect)) {
             // 新增计划
-            info.setAuditResult("-1");
+            //info.setAuditResult("-1");
             PlanDto planDto = dto.getPlanDto();
             if (null != planDto) {
                 planDto.setPlanType(PlanTypeEnum.PLAN_TYPE_TROUBLE.getCode());

msss-scada/src/main/java/com/tofly/scada/controller/ThirdDataPullController.java

@@ -1,6 +1,7 @@
 package com.tofly.scada.controller;
 
-import com.alibaba.ttl.TtlRunnable;
+//import com.alibaba.ttl.TtlRunnable;
+//import com.alibaba.ttl.TtlRunnable;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.oauth.auth.ToflyUser;
@@ -45,7 +46,7 @@ private ThreadPoolTaskExecutor threadPoolTaskExecutor;
     }
 
 
-    @ApiOperation(value = "水厂数据拉取")
+   /* @ApiOperation(value = "水厂数据拉取")
     @GetMapping("/pullTest")
     public ResultRespone pullTest() {
         final ToflyUser user = SecurityUtils.getUser();
@@ -53,7 +54,7 @@ private ThreadPoolTaskExecutor threadPoolTaskExecutor;
         threadPoolTaskExecutor.execute(TtlRunnable.get(()->
                 System.out.println(SecurityContextHolder.getContext().getAuthentication())));
         return ResultRespone.success();
-    }
+    }*/
 
 
 }