报表

hjzx-api/src/main/java/api/controller/call/CallLogController.java

@@ -68,7 +68,7 @@ public class CallLogController extends BaseController {
         qw.le(!StringHelper.isEmpty(input.getEndTime()) , CallLog::getCreateTime, input.getEndTime());
         if (isNote.equals("1"))
         {
-            qw.eq(CallLog::getNote,"1");
+            qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
         }
 
 
@@ -195,7 +195,7 @@ public class CallLogController extends BaseController {
         qw.eq(input.getMyd() != null , CallLog::getMyd, input.getMyd());
         if (isNote.equals("1"))
         {
-            qw.eq(CallLog::getNote,"1");
+            qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
         }
         qw.eq(!StringHelper.isEmpty(input.getWorkordercode()), CallLog::getWorkordercode, input.getWorkordercode());
         qw.orderByDesc(CallLog::getId);

hjzx-api/src/main/java/api/controller/report/DataAnalysisController.java

@@ -1,28 +1,24 @@
 package api.controller.report;
 
 import api.controller.BaseController;
-import api.entity.view.report.ScreenConnection;
 import api.model.AjaxResult;
 import api.service.report.IDataAnalysisService;
 import api.service.report.IReportBaseService;
 import api.util.annotation.Anonymous;
 import api.util.annotation.Log;
 import api.util.enums.BusinessType;
-import api.util.helper.SpringHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
 
 @Api(value = "大屏",tags = "大屏")
 @RestController
 @RequestMapping("/DataAnalysis")
+@Anonymous
 public class DataAnalysisController extends BaseController {
     @Autowired
     private IReportBaseService ReportBaseService;
@@ -54,15 +50,33 @@ public class DataAnalysisController extends BaseController {
     @ApiOperation("话务分布")
     @Log(title = "话务分布",businessType = BusinessType.QUERY)
     @GetMapping("/selectRegionOrderCount/{type}")
-    public AjaxResult selectRegionOrderCount(@PathVariable long type  )  {
-        var obj =DataAnalysisService.selectRegionOrderCount(type);
+    public AjaxResult selectRegionOrderCount(@PathVariable long type, Long area )  {
+        long level=3;
+        if (area==null)
+        {
+            area=1743L;
+        }
+        if (area!=1743L)
+        {
+            level=4;
+        }
+        var obj =DataAnalysisService.selectRegionOrderCount(type,level,area);
         return Success("成功",obj);
     }
     @ApiOperation("话务分布")
     @Log(title = "话务分布",businessType = BusinessType.QUERY)
     @GetMapping("/selectRegionOrder/{type}")
-    public AjaxResult selectRegionOrder(@PathVariable long type  )  {
-        var obj =DataAnalysisService.selectRegionOrder(type);
+    public AjaxResult selectRegionOrder(@PathVariable long type, Long area  )  {
+        long level=3;
+        if (area==null)
+        {
+            area=1743L;
+        }
+        if (area!=1743L)
+        {
+            level=4;
+        }
+        var obj =DataAnalysisService.selectRegionOrder(type,level,area);
         return Success("成功",obj);
     }
 
@@ -95,6 +109,19 @@ public class DataAnalysisController extends BaseController {
         return Success("成功",obj);
     }
 
-
+    @ApiOperation("区域业务类型")
+    @Log(title = "区域业务类型",businessType = BusinessType.QUERY)
+    @GetMapping("/selectBusinessType/{type}")
+    public AjaxResult selectBusinessAreaType(@PathVariable long type, Long area  )  {
+        var obj =DataAnalysisService.selectBusinessType(type,area);
+        return Success("成功",obj);
+    }
+    @ApiOperation("区域关键词数量")
+    @Log(title = "区域关键词数量",businessType = BusinessType.QUERY)
+    @GetMapping("/selectAreaKeywordCount/{type}")
+    public AjaxResult selectAreaKeywordCount(@PathVariable long type, Long area )  {
+        var obj =DataAnalysisService.selectAreaKeywordCount(type,area);
+        return Success("成功",obj);
+    }
 
 }

hjzx-api/src/main/java/api/controller/report/WorkReportController.java

@@ -28,6 +28,7 @@ import java.util.List;
 @Api(value = "报表",tags = "报表")
 @RestController
 @RequestMapping("/WorkReport")
+@Anonymous
 public class WorkReportController extends BaseController {
     @Autowired
     private IReportBaseService ReportBaseService;

hjzx-api/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.200:3306/hjzx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.8:3306/hjzx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
     username: root
     password: 800100
 

hjzx-entity/src/main/java/api/entity/view/config/GlobalConfig.java

@@ -1,15 +1,6 @@
 package api.entity.view.config;
-
 import api.util.helper.SpringHelper;
-
-
-
-
-
-
 public class GlobalConfig {
+    /**八院过滤参数**/
     public  static  final String isNote= SpringHelper.getRequiredProperty("spring.isNote");;
-
-
-
 }

hjzx-mapper/src/main/java/api/mapper/report/ReportMapper.java

@@ -36,7 +36,7 @@ public interface ReportMapper {
     public  List<RecordReport> selectRecordReport(ScreenReport Report);
 
     /**工单分类表**/
-    public  List<CompleteView> selectBusinessType ( );
+    public  List<CompleteView> selectBusinessType (String time,Long area );
     /**工单处理趋势**/
     public  List<HourReport> selectDealingWithTrends(Date beginTime, Date endTime);
     /**话务量统计**/
@@ -64,13 +64,14 @@ public interface ReportMapper {
     public  List<CompleteView> selectAICount ( );
 
     /**智能统计**/
-    public  List<RegionOrder> selectRegionOrderCount (String time );
+    public  List<RegionOrder> selectRegionOrderCount (String time,long type,long area );
 
 
     /**话务简报**/
     public  TelephoneBriefing selectTelephoneBriefing (String startTime,  String endTime  );
     /**话务数据**/
     public  RecordDateView selectTelephoneData (String time  );
-
+    /**区域关键词数量**/
+    public  List<CompleteView> selectAreaKeywordCount (String time ,Long area  );
 
 }

hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -246,7 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND `callee_agent`= #{usercode}
 		</if>
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 
 		GROUP BY `callee_agent`
@@ -260,6 +260,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where createtime >= CURDATE() - INTERVAL DAY(CURDATE()) - 1 DAY
 		AND createtime <![CDATA[<=]]> DATE_ADD(CURDATE() - DAY(CURDATE()) + 1, INTERVAL 1 MONTH)
 		and isdelete=0
+		<if test="time != null and time !='' ">
+			and YEAR(create_time) = YEAR(CURRENT_DATE)
+			AND ${time}(create_time) = ${time}(CURRENT_DATE)
+		</if>
+		<if test="area >0  ">
+			AND `area`= #{area}
+		</if>
 		group by ancestors)  b on  CONCAT(b.ancestors,',')  LIKE CONCAT('%', a.ancestors,',' '%')
 		group by Name
 
@@ -285,7 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		where  DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 		GROUP BY DATE
 		ORDER BY DATE;
@@ -298,7 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		where  1=1
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 	</select>
 	<select id="selectTrafficMeasurement"  parameterType="Date" resultMap="TrafficMeasurementResult">
@@ -310,7 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		WHERE `create_time`>=#{beginTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 	</select>
 
@@ -322,7 +329,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		and call_type=1
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 		<if test="isAnswer >-1  ">
 			AND `is_answer`= #{isAnswer}
@@ -338,7 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from  rep_record where
 		DATE_FORMAT(  `create_time`, '%Y-%m' )= DATE_FORMAT( #{time}, '%Y-%m' )
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 	</select>
 
@@ -358,7 +365,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		and call_type=1
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 		group by DATE
 		order by DATE
@@ -403,7 +410,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		) v2 ON v1.workordercode = v2.workordercode
 		AND v1.visit_id = v2.visit_id
 		) lv ON wo.workordercode = lv.workordercode
-		where  a.type=3  and a.parent_id=1743
+		where 1=1
+		 and  a.type=#{type} and a.parent_id=#{area}
 		GROUP BY a.id ;
 	</select>
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
@@ -434,7 +442,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		where 1=1
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND note = '1'
+			AND IFNULL(note,'1')='1'
 		</if>
 		<if test="startTime != null and startTime !=''">
 			AND UNIX_TIMESTAMP(`create_time`)>=UNIX_TIMESTAMP(#{startTime})
@@ -443,6 +451,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND UNIX_TIMESTAMP(`create_time`) <![CDATA[<=]]> UNIX_TIMESTAMP(#{endTime})
 		</if>
 	</select>
-
+	<select id="selectAreaKeywordCount"  parameterType="Long" resultMap="CompleteView">
+		SELECT
+		keyword_text AS `Name`,
+		SUM(keyword_count) AS `number`
+		FROM
+		wo_workorderbase o
+		JOIN
+		rep_translate k ON o.call_id = k.callid
+		JOIN
+		JSON_TABLE(
+		k.translate_json,
+		'$[*]' COLUMNS (
+		keyword_text VARCHAR(255) PATH '$.text',
+		keyword_count INT PATH '$.count'
+		)
+		) AS jt
+		WHERE
+		<if test="area >0   ">
+			o.area = #{area}
+		</if>
+		<if test="time != null and time !='' ">
+			and YEAR(create_time) = YEAR(CURRENT_DATE)
+			AND ${time}(create_time) = ${time}(CURRENT_DATE)
+		</if>
+		GROUP BY
+		keyword_text
+		ORDER BY
+		SUM(keyword_count) DESC
+		LIMIT 10;
+	</select>
 
 </mapper> 

hjzx-service/src/main/java/api/service/report/IDataAnalysisService.java

@@ -1,5 +1,6 @@
 package api.service.report;
 
+import api.entity.view.report.CompleteView;
 import api.entity.view.report.HourReport;
 import api.entity.view.report.RegionOrder;
 
@@ -13,10 +14,10 @@ public interface IDataAnalysisService {
     HashMap<String,Object>  selectTrafficMeasurement();
 
     //话务分布
-    HashMap<String,Object>   selectRegionOrder(Long type);
+    HashMap<String,Object>   selectRegionOrder(Long type,long level,long area);
 
     //话务分布
-    List<RegionOrder>selectRegionOrderCount(Long   type );
+    List<RegionOrder>selectRegionOrderCount(Long   type,long level,long area );
 
     //智能统计
     HashMap<String,Object>  selectIntelligent();
@@ -31,4 +32,10 @@ public interface IDataAnalysisService {
 
     //满意度统计
     HashMap<String,Object> selectSatisfaction();
+
+    //区域业务类型
+     List<HashMap<String,Object>>  selectBusinessType(Long type,long area);
+
+    //区域关键词数量
+    List<CompleteView>   selectAreaKeywordCount(Long type, long area);
 }

hjzx-service/src/main/java/api/service/report/impl/DataAnalysisServiceImpl.java

@@ -57,7 +57,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
     }
     //话务分布
     @Override
-    public HashMap<String,Object>   selectRegionOrder(Long   type )
+    public HashMap<String,Object>   selectRegionOrder(Long   type,long level,long area )
     {
         String time="";
         if (type!=null&&type>0)
@@ -73,14 +73,14 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         }
         HashMap<String,Object> obj=new HashMap<>();
         obj.put("traffic", reportMapper.selectTelephoneData(time));//话务数据
-        obj.put("order", reportMapper.selectRegionOrderCount(time));//工单数据
+        obj.put("order", reportMapper.selectRegionOrderCount(time,level,area));//工单数据
 
        return obj;
     }
 
     //话务分布
     @Override
-    public List<RegionOrder>selectRegionOrderCount(Long   type )
+    public List<RegionOrder>selectRegionOrderCount(Long   type,long level,long area )
     {
         String time="";
         if (type!=null&&type>0)
@@ -94,7 +94,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
                 time="WEEK";
             }
         }
-        return  reportMapper.selectRegionOrderCount(time);
+        return  reportMapper.selectRegionOrderCount(time,level,area);
     }
 
     //智能统计
@@ -335,4 +335,65 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         }
         return obj;
     }
+    //区域业务类型
+    @Override
+    public List<HashMap<String,Object>>  selectBusinessType(Long types,long area)  {
+        String time="";
+        if (types!=null&&types>0)
+        {
+            if (types==1)
+            {
+                time="MONTH";
+            }
+            else
+            {
+                time="WEEK";
+            }
+        }
+        List<HashMap<String,Object>> MapList = new ArrayList<HashMap<String,Object>>();
+        List<CompleteView>  BusinessType= reportMapper.selectBusinessType( time,area);
+        if (BusinessType!=null)
+        {
+            long total=BusinessType.stream().filter(x->x.getNumber()!=null).mapToLong(CompleteView::getNumber).sum();
+            for (var type : BusinessType) {
+                HashMap<String,Object> obj=new LinkedHashMap<>();
+                obj.put("name",type.getName());
+                if (type.getNumber()==null)
+                {
+                    type.setNumber(0L);
+                }
+                obj.put("number",type.getNumber());
+                if (total>0)
+                {
+                    double rate = ( (double)type.getNumber() / total);
+                    obj.put("rate",String.format("%.2f",rate*100)+"%");
+                }
+                else
+                {
+                    obj.put("rate","0%");
+                }
+                MapList.add(obj);
+            }
+        }
+        return MapList;
+    }
+    //区域关键词数量
+    @Override
+    public  List<CompleteView>   selectAreaKeywordCount(Long type, long area)
+    {
+        String time="";
+        if (type!=null&&type>0)
+        {
+            if (type==1)
+            {
+                time="MONTH";
+            }
+            else
+            {
+                time="WEEK";
+            }
+        }
+
+        return reportMapper.selectAreaKeywordCount(time,area);
+    }
 }

hjzx-service/src/main/java/api/service/report/impl/ReportBaseServiceImpl.java

@@ -76,7 +76,7 @@ public class ReportBaseServiceImpl implements IReportBaseService {
     public List<HashMap<String,Object>>  selectBusinessType()  {
 
         List<HashMap<String,Object>> MapList = new ArrayList<HashMap<String,Object>>();
-        List<CompleteView>  BusinessType= reportMapper.selectBusinessType( );
+        List<CompleteView>  BusinessType= reportMapper.selectBusinessType("", 0L);
         if (BusinessType!=null)
         {
             long total=BusinessType.stream().filter(x->x.getNumber()!=null).mapToLong(CompleteView::getNumber).sum();