Merge branch 'bayuan' into bayuan-feat

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

@@ -11,6 +11,7 @@ import api.service.call.ITranslateService;
 import api.service.system.IConfigService;
 import api.util.annotation.Anonymous;
 import api.util.helper.ExcelHelper;
+import api.util.helper.SpringHelper;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -48,7 +49,8 @@ public class CallLogController extends BaseController {
     private ITranslateService translateService;
     @Autowired
     private UserMapper userMapper;
-
+    @Autowired
+    public  static  final String isNote= SpringHelper.getRequiredProperty("spring.isNote");;
     @ApiOperation("列表")
     @Log(title = "查询通话记录表列表",businessType = BusinessType.QUERY)
     @GetMapping
@@ -64,6 +66,10 @@ public class CallLogController extends BaseController {
         qw.eq(input.getCallType() != null && input.getCallType() > 0, CallLog::getCallType, input.getCallType());
         qw.ge(!StringHelper.isEmpty(input.getStartTime()) , CallLog::getCreateTime, input.getStartTime());
         qw.le(!StringHelper.isEmpty(input.getEndTime()) , CallLog::getCreateTime, input.getEndTime());
+        if (isNote.equals("1"))
+        {
+            qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
+        }
 
 
 //        qw.le(input.getHangupTime() != null, CallLog::getCreateTime, input.getHangupTime());
@@ -187,6 +193,10 @@ public class CallLogController extends BaseController {
         qw.eq(input.getIsAnswer() != null , CallLog::getIsAnswer, input.getIsAnswer());
         qw.eq(input.getOpType() != null , CallLog::getOpType, input.getOpType());
         qw.eq(input.getMyd() != null , CallLog::getMyd, input.getMyd());
+        if (isNote.equals("1"))
+        {
+            qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
+        }
         qw.eq(!StringHelper.isEmpty(input.getWorkordercode()), CallLog::getWorkordercode, input.getWorkordercode());
         qw.orderByDesc(CallLog::getId);
         var list=calllogService.getList(qw);

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -126,7 +126,7 @@ public class WorkOrderBaseController extends BaseController {
 
         qw.eq(!StringHelper.isEmpty(input.getCustomerno()), WorkOrderBase::getCustomerno, input.getCustomerno());
 
-
+        qw.eq(!StringHelper.isEmpty(input.getCreateuser()), WorkOrderBase::getCreateuser, input.getCreateuser());
         qw.eq(WorkOrderBase::getIsdelete, 0);
 
         //ge("age", 18)表示查询年龄大于等于18的记录。

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

@@ -1,7 +1,6 @@
 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;
@@ -12,16 +11,14 @@ 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;
@@ -53,8 +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, 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);
     }
 
@@ -79,5 +101,27 @@ public class DataAnalysisController extends BaseController {
         var obj =DataAnalysisService.select24TrafficTrends();
         return Success("成功",obj);
     }
+    @ApiOperation("话务趋势(周)")
+    @Log(title = "话务趋势(周)",businessType = BusinessType.QUERY)
+    @GetMapping("/selectWeekTrafficTrends")
+    public AjaxResult selectWeekTrafficTrends()  {
+        var obj =DataAnalysisService.selectWeekTrafficTrends();
+        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/java/api/controller/system/UserController.java

@@ -46,6 +46,7 @@ public class UserController extends BaseController {
 
     @Autowired
     private IAddressBookService addressBookService;
+
     @ApiOperation("列表")
     @Log(title = "查询用户信息表列表", businessType = BusinessType.QUERY)
     @GetMapping
@@ -54,21 +55,19 @@ public class UserController extends BaseController {
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper();
 
         qw.eq(input.getUserId() != null && input.getUserId() > 0, User::getUserId, input.getUserId());
-       // qw.eq(input.getDeptId() != null && input.getDeptId() > 0, User::getDeptId, input.getDeptId());
-        if (input.getDeptId() != null &&input.getDeptId()>0)
-        {
+        // qw.eq(input.getDeptId() != null && input.getDeptId() > 0, User::getDeptId, input.getDeptId());
+        if (input.getDeptId() != null && input.getDeptId() > 0) {
             //查询下级部门所有人员
-            qw.and(wq->{
+            qw.and(wq -> {
                 wq.inSql(User::getDeptId, "select dept_id from sys_dept where  " +
-                        " ancestors REGEXP CONCAT((select  ancestors from sys_dept where dept_id="+input.getDeptId()+"),',',"
-                        +input.getDeptId()+") ") ;
-                wq.or().eq(User::getDeptId,input.getDeptId());
+                        " ancestors REGEXP CONCAT((select  ancestors from sys_dept where dept_id=" + input.getDeptId() + "),',',"
+                        + input.getDeptId() + ") ");
+                wq.or().eq(User::getDeptId, input.getDeptId());
             });
         }
         //查询角色
-        if (input.getRoleId()!=null&&input.getRoleId()>0)
-        {
-            qw.inSql(User::getUserId, "select user_id from sys_user_role where role_id="+input.getRoleId());
+        if (input.getRoleId() != null && input.getRoleId() > 0) {
+            qw.inSql(User::getUserId, "select user_id from sys_user_role where role_id=" + input.getRoleId());
         }
         qw.like(!StringHelper.isEmpty(input.getUserName()), User::getUserName, input.getUserName());
         qw.like(!StringHelper.isEmpty(input.getNickName()), User::getNickName, input.getNickName());
@@ -86,7 +85,6 @@ public class UserController extends BaseController {
             IPage<User> iPage = userService.selectUserDeptList(page, qw);
 
 
-
             return Success("成功", iPage.getRecords(), iPage.getTotal());
         } else {
             return Success("成功", userService.selectUserDeptList(qw));
@@ -131,17 +129,15 @@ public class UserController extends BaseController {
         if (result) {
 
             //根据电话，判断通讯录中是否存在，不存在新增一条记录
-            LambdaQueryWrapper<AddressBook> lqwaddress=new LambdaQueryWrapper<>();
-            lqwaddress.eq(AddressBook::getMobile,user.getPhonenumber());
+            LambdaQueryWrapper<AddressBook> lqwaddress = new LambdaQueryWrapper<>();
+            lqwaddress.eq(AddressBook::getMobile, user.getPhonenumber());
 
-            List<AddressBook> addressBooks= addressBookService.getList(lqwaddress);
+            List<AddressBook> addressBooks = addressBookService.getList(lqwaddress);
 
-            if(addressBooks!=null &&addressBooks.stream().count()>0)
-            {
+            if (addressBooks != null && addressBooks.stream().count() > 0) {
 
-            }
-            else {
-                AddressBook addressBook=new AddressBook();
+            } else {
+                AddressBook addressBook = new AddressBook();
                 addressBook.setMobile(user.getPhonenumber());
                 addressBook.setName(user.getNickName());
                 addressBook.setType(2L);
@@ -172,7 +168,7 @@ public class UserController extends BaseController {
             return Error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         User use = userService.selectUserById(user.getUserId());
-        if (use==null)
+        if (use == null)
             return Error("用户不存在");
         user.setPassword(use.getPassword());
         user.setCreateBy(CurrentUser().getUserName());
@@ -180,20 +176,18 @@ public class UserController extends BaseController {
         boolean result = userService.update(user);
         if (result) {
             //根据电话，判断通讯录中是否存在，不存在新增一条记录
-            LambdaQueryWrapper<AddressBook> lqwaddress=new LambdaQueryWrapper<>();
-            lqwaddress.eq(AddressBook::getMobile,user.getPhonenumber());
+            LambdaQueryWrapper<AddressBook> lqwaddress = new LambdaQueryWrapper<>();
+            lqwaddress.eq(AddressBook::getMobile, user.getPhonenumber());
 
-            List<AddressBook> addressBooks= addressBookService.getList(lqwaddress);
+            List<AddressBook> addressBooks = addressBookService.getList(lqwaddress);
 
-            if(addressBooks!=null &&addressBooks.stream().count()>0)
-            {
-                AddressBook addr= addressBooks.stream().findFirst().get();
+            if (addressBooks != null && addressBooks.stream().count() > 0) {
+                AddressBook addr = addressBooks.stream().findFirst().get();
                 addr.setName(user.getNickName());
                 addressBookService.update(addr);
 
-            }
-            else {
-                AddressBook addressBook=new AddressBook();
+            } else {
+                AddressBook addressBook = new AddressBook();
                 addressBook.setMobile(user.getPhonenumber());
                 addressBook.setName(user.getNickName());
                 addressBook.setType(2L);
@@ -238,7 +232,7 @@ public class UserController extends BaseController {
     public AjaxResult resetPwd(@RequestBody User user) {
         //校验用户操作
         //校验用户权限
-     //   userService.checkUserAllowed(user);
+        //   userService.checkUserAllowed(user);
         //userService.checkUserDataScope(user);
 
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
@@ -260,19 +254,19 @@ public class UserController extends BaseController {
         }
         return Error("修改失败!");
     }
+
     /**
      * 修改密码
      */
     @ApiOperation("修改密码")
     @Log(title = "修改密码", businessType = BusinessType.OTHER)
     @PutMapping("/UpdatePwd")
-    public AjaxResult UpdatePwd(String oldPwd ,String Pwd) {
-        UserView currentUser=CurrentUser();
-        if (!currentUser.getPassword().equals(SecretHelper.MD5(oldPwd)))
-        {
+    public AjaxResult UpdatePwd(String oldPwd, String Pwd) {
+        UserView currentUser = CurrentUser();
+        if (!currentUser.getPassword().equals(SecretHelper.MD5(oldPwd))) {
             return Error("旧密码不正确");
         }
-        var  entity=userService.getEntity(currentUser.getUserId());
+        var entity = userService.getEntity(currentUser.getUserId());
         String password = SecretHelper.MD5(Pwd);
         entity.setPassword(password);
         if (userService.update(entity)) {
@@ -287,15 +281,16 @@ public class UserController extends BaseController {
     @ApiOperation("修改图像")
     @Log(title = "修改图像", businessType = BusinessType.OTHER)
     @GetMapping("/avatar")
-    public AjaxResult avatar( String url) {
-       UserView currentUser=CurrentUser();
-        var  entity=userService.getEntity(currentUser.getUserId());
+    public AjaxResult avatar(String url) {
+        UserView currentUser = CurrentUser();
+        var entity = userService.getEntity(currentUser.getUserId());
         entity.setAvatar(url);
         if (userService.update(entity)) {
             return Success("修改成功!");
         }
         return Error("修改失败!");
     }
+
     /**
      * 修改状态
      *
@@ -335,7 +330,6 @@ public class UserController extends BaseController {
     }
 
 
-
     @GetMapping("/deptUserTree")
     @Anonymous
     public AjaxResult deptUserTree(Dept dept) {
@@ -343,11 +337,8 @@ public class UserController extends BaseController {
     }
 
 
-
-
     /**
      * 导出excel
-     *
      */
     @ApiOperation("导出Excel")
     @Log(title = "导出excel", businessType = BusinessType.EXPORT)
@@ -444,6 +435,7 @@ public class UserController extends BaseController {
 
     /**
      * 分配角色
+     *
      * @param userId
      * @return
      */

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
 
@@ -71,4 +71,6 @@ spring:
     port: 9200
     auth: false
     username:
-    password:
+    password:
+
+  isNote: 1

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

@@ -71,4 +71,6 @@ spring:
     port: 9200
     auth: false
     username:
-    password:
+    password:
+
+  isNote: 1

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

@@ -0,0 +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

@@ -1,13 +1,18 @@
 package api.mapper.report;
 
 import api.entity.view.report.*;
+import api.util.helper.SpringHelper;
+
 import org.apache.ibatis.annotations.Mapper;
 
+
 import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface ReportMapper {
+
+
     /**
      *
      *
@@ -27,36 +32,46 @@ public interface ReportMapper {
     /**工单分类报表**/
     public  List<WorkOrderTypeReport> selectWorkOrderTypeReport(ScreenReport Report);
     /**话务工作报表**/
+
     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);
     /**话务量统计**/
+
     public  List<TrafficView> selectTraffic();
     /**话务量统计**/
+
     public SatisfactionView selectSatisfaction();
     /**话务量统计**/
+
     public  TrafficMeasurement selectTrafficMeasurement(Date beginTime, Date endTime);
     /**话务量统计**/
+
     public  List<HourReport> selectConnection(ScreenConnection Report);
     /**话务统计**/
+
     public RecordDateView selectRecord(String time);
     /**回访数量**/
     public  long selectVisitCount(String time);
     /**话务趋势**/
+
     public  List<TrafficView> selectCallTrends(ScreenConnection Report);
 
     /**智能统计**/
     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

@@ -245,6 +245,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="usercode != null and usercode != ''">
 			AND `callee_agent`= #{usercode}
 		</if>
+		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
+			AND IFNULL(note,'1')='1'
+		</if>
+
 		GROUP BY `callee_agent`
 	</select>
 
@@ -256,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
 
@@ -280,16 +291,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		count(call_type=1 and is_answer=0 or null  )  noAnswer
 		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 IFNULL(note,'1')='1'
+		</if>
 		GROUP BY DATE
 		ORDER BY DATE;
 	</select>
 	<select id="selectSatisfaction"  parameterType="Date" resultMap="SatisfactionViewResult">
 		select
-		count(myd=2 or null  )  basically,
-		count(myd=1 and is_answer=1 or null  )  satisfied,
-		count(myd=3 and is_answer=1 or null  )  dissatisfied
+		count(myd=2  or null  )  basically,
+		count(myd=1  or null  )  satisfied,
+		count(myd=3  or null  )  dissatisfied
 		from rep_record
-		where  DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+		where  1=1
+		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
+			AND IFNULL(note,'1')='1'
+		</if>
 	</select>
 	<select id="selectTrafficMeasurement"  parameterType="Date" resultMap="TrafficMeasurementResult">
 		select
@@ -299,6 +316,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AVG(TIMESTAMPDIFF(SECOND, answer_time, hangup_time) and is_answer=1  AND call_type=1  ) avgAnswer
 		from rep_record
 		WHERE `create_time`>=#{beginTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
+		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
+			AND IFNULL(note,'1')='1'
+		</if>
 	</select>
 
 	<select id="selectConnection"  parameterType="api.entity.view.report.ScreenConnection" resultMap="SysReportHourResult">
@@ -308,6 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		and call_type=1
+		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
+			AND IFNULL(note,'1')='1'
+		</if>
 		<if test="isAnswer >-1  ">
 			AND `is_answer`= #{isAnswer}
 		</if>
@@ -321,6 +344,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		COUNT(1) total
 		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 IFNULL(note,'1')='1'
+		</if>
 	</select>
 
 	<select id="selectVisitCount"  parameterType="String" resultType="long">
@@ -338,6 +364,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		and call_type=1
+		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
+			AND IFNULL(note,'1')='1'
+		</if>
 		group by DATE
 		order by DATE
 	</select>
@@ -381,9 +410,19 @@ 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">
+		select count(1) total,
+		count(note=1 or null )	incoming,		count(note=2 or null )	exhalation  from rep_record
+		where 1=1
+		<if test="time != null and time !='' ">
+			and YEAR(create_time) = YEAR(CURRENT_DATE)
+			AND ${time}(create_time) = ${time}(CURRENT_DATE)
+		</if>
+	</select>
 
 
 	<select id="selectTelephoneBriefing"  parameterType="String" resultMap="TelephoneBriefingResult">
@@ -402,6 +441,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		count(myd=3  or null  )  dissatisfied
 		from rep_record
 		where 1=1
+		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
+			AND IFNULL(note,'1')='1'
+		</if>
 		<if test="startTime != null and startTime !=''">
 			AND UNIX_TIMESTAMP(`create_time`)>=UNIX_TIMESTAMP(#{startTime})
 		</if>
@@ -409,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,7 +14,10 @@ public interface IDataAnalysisService {
     HashMap<String,Object>  selectTrafficMeasurement();
 
     //话务分布
-    List<RegionOrder>selectRegionOrderCount(Long   type );
+    HashMap<String,Object>   selectRegionOrder(Long type,long level,long area);
+
+    //话务分布
+    List<RegionOrder>selectRegionOrderCount(Long   type,long level,long area );
 
     //智能统计
     HashMap<String,Object>  selectIntelligent();
@@ -21,9 +25,17 @@ public interface IDataAnalysisService {
     //话务趋势
     List<HashMap<String,Object>> selectTrafficTrends() ;
 
+    List<HashMap<String,Object>> selectWeekTrafficTrends();
+
     //24小时话务量趋势
     List<HourReport> select24TrafficTrends();
 
     //满意度统计
     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

@@ -3,7 +3,6 @@ package api.service.report.impl;
 import api.entity.view.report.*;
 import api.mapper.report.ReportMapper;
 import api.service.report.IDataAnalysisService;
-import api.util.helper.StringHelper;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,7 +57,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
     }
     //话务分布
     @Override
-    public List<RegionOrder>selectRegionOrderCount(Long   type )
+    public HashMap<String,Object>   selectRegionOrder(Long   type,long level,long area )
     {
         String time="";
         if (type!=null&&type>0)
@@ -72,10 +71,31 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
                 time="WEEK";
             }
         }
-       return  reportMapper.selectRegionOrderCount(time);
-    }
+        HashMap<String,Object> obj=new HashMap<>();
+        obj.put("traffic", reportMapper.selectTelephoneData(time));//话务数据
+        obj.put("order", reportMapper.selectRegionOrderCount(time,level,area));//工单数据
 
+       return obj;
+    }
 
+    //话务分布
+    @Override
+    public List<RegionOrder>selectRegionOrderCount(Long   type,long level,long area )
+    {
+        String time="";
+        if (type!=null&&type>0)
+        {
+            if (type==1)
+            {
+                time="MONTH";
+            }
+            else
+            {
+                time="WEEK";
+            }
+        }
+        return  reportMapper.selectRegionOrderCount(time,level,area);
+    }
 
     //智能统计
     @Override
@@ -163,6 +183,11 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
                     view.put("answerRate","0%");//接听比例
                 }
             }
+            else
+            {
+                view.put("incoming",0L);
+                view.put("answerRate","0%");//接听比例
+            }
             Report.add(view);
 
             calendar1.add(Calendar.MONTH,1);
@@ -170,6 +195,73 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         }
         return Report;
     }
+
+    @Override
+    public List<HashMap<String,Object>> selectWeekTrafficTrends()  {
+        ScreenConnection connection =new ScreenConnection();
+
+        // 定义时间格式
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat weekSdf = new SimpleDateFormat("EEEE",Locale.SIMPLIFIED_CHINESE);
+        Date date=new Date();
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(date);
+        calendar2.add(Calendar.DAY_OF_MONTH,-6);
+        connection.setStartTime(sdf1.format(calendar2.getTime()));//最近7天
+        connection.setEndTime(sdf1.format(date));//今天
+        // 将字符串解析为 Date 对象
+        Date time1 = calendar2.getTime();
+        connection.setGrouping("%Y-%m-%d");
+
+        List<TrafficView>  Traffic= reportMapper.selectCallTrends( connection);
+        List<HashMap<String,Object>> Report=new ArrayList<>();
+        Date temp=time1;
+        DecimalFormat df = new DecimalFormat("#.00");
+        while (temp.getTime()<=date.getTime())
+        {
+            Calendar calendar1= Calendar.getInstance();
+            calendar1.setTime(temp);
+            Date finalTemp =calendar1.getTime();
+            HashMap<String,Object> view=new HashMap<>();
+            view.put("date", weekSdf.format(finalTemp) );
+            if (Traffic!=null &&Traffic.size()>0)
+            {
+                if (Traffic.stream().anyMatch(x -> x.getDATE().equals(sdf.format(finalTemp)) ))
+                {
+                    var traffaic=Traffic.stream().filter(x->x.getDATE().equals(sdf.format(finalTemp))).
+                            findFirst().get();
+                    view.put("incoming",traffaic.getIncoming());//呼入量
+
+                    if  (traffaic.getIncoming()>0)
+                    {
+                        double answerRate=  (double)traffaic.getAnswer()/traffaic.getIncoming()*100;
+                        view.put("answerRate",df.format(answerRate)+"%");//接听比例
+                    }
+                    else
+                    {
+                        view.put("answerRate","0%");//接听比例
+                    }
+
+                }
+                else
+                {
+                    view.put("incoming",0L);
+                    view.put("answerRate","0%");//接听比例
+                }
+            }
+            else
+            {
+                view.put("incoming",0L);
+                view.put("answerRate","0%");//接听比例
+            }
+            Report.add(view);
+
+            calendar1.add(Calendar.DAY_OF_MONTH,1);
+            temp=calendar1.getTime();
+        }
+        return Report;
+    }
     //24小时话务量趋势
     @Override
     public List<HourReport> select24TrafficTrends()  {
@@ -243,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

@@ -4,6 +4,7 @@ package api.service.report.impl;
 import api.entity.view.report.*;
 import api.mapper.report.ReportMapper;
 import api.service.report.IReportBaseService;
+import api.util.helper.SpringHelper;
 import api.util.helper.StringHelper;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,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();

hjzx-util/src/main/java/api/util/config/MybatisPlusConfig.java

@@ -31,6 +31,9 @@ public class MybatisPlusConfig {
     //listMaps、getMap等 方法获取数据后，下划线未转驼峰问题
     @Bean
     public ConfigurationCustomizer configurationCustomizer() {
-        return i -> i.setObjectWrapperFactory(new MybatisMapWrapperFactory());
+        return configuration -> {
+            // 解决 Map 下划线转驼峰问题
+            configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory());
+        };
     }
 }