话务趋势，数据隔离

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

@@ -64,7 +64,8 @@ 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());
-
+        //只显示八院记录
+        qw.eq(CallLog::getNote,1);
 
 //        qw.le(input.getHangupTime() != null, CallLog::getCreateTime, input.getHangupTime());
 //        qw.ge(input.getAnswerTime() != null, CallLog::getCreateTime, input.getAnswerTime());
@@ -187,6 +188,8 @@ 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());
+        //只显示八院记录
+        qw.eq(CallLog::getNote,1);
         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/report/DataAnalysisController.java

@@ -79,5 +79,14 @@ 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);
+    }
+
+
 
 }

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-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -235,7 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 		FROM `rep_record` a
 		WHERE 1=1 AND `callee_agent`!='' AND `callee_agent` IS NOT NULL
-		AND `call_type`=1
+		AND `call_type`=1  AND  note='1'
 		<if test="startTime != null and startTime !=''">
 			AND UNIX_TIMESTAMP(`create_time`)>=UNIX_TIMESTAMP(#{startTime})
 		</if>
@@ -280,16 +280,18 @@ 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')
+		AND  note='1'
 		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
+		AND  note='1'
 	</select>
 	<select id="selectTrafficMeasurement"  parameterType="Date" resultMap="TrafficMeasurementResult">
 		select
@@ -299,6 +301,7 @@ 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}
+		AND  note='1'
 	</select>
 
 	<select id="selectConnection"  parameterType="api.entity.view.report.ScreenConnection" resultMap="SysReportHourResult">
@@ -307,7 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		DATE_FORMAT(  `create_time`, #{grouping} ) as DATE
 		from rep_record
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
-		and call_type=1
+		and call_type=1 AND  note='1'
 		<if test="isAnswer >-1  ">
 			AND `is_answer`= #{isAnswer}
 		</if>
@@ -321,6 +324,7 @@ 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' )
+		 AND  note='1'
 	</select>
 
 	<select id="selectVisitCount"  parameterType="String" resultType="long">
@@ -337,7 +341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		count(call_type=1 and is_answer=0 or null  )  noAnswer
 		from rep_record
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
-		and call_type=1
+		and call_type=1 AND  note='1'
 		group by DATE
 		order by DATE
 	</select>
@@ -401,7 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		count(myd=1 or null  )  satisfied,
 		count(myd=3  or null  )  dissatisfied
 		from rep_record
-		where 1=1
+		where 1=1 AND  note='1'
 		<if test="startTime != null and startTime !=''">
 			AND UNIX_TIMESTAMP(`create_time`)>=UNIX_TIMESTAMP(#{startTime})
 		</if>

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

@@ -21,6 +21,8 @@ public interface IDataAnalysisService {
     //话务趋势
     List<HashMap<String,Object>> selectTrafficTrends() ;
 
+    List<HashMap<String,Object>> selectWeekTrafficTrends();
+
     //24小时话务量趋势
     List<HourReport> select24TrafficTrends();
 

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;
@@ -163,6 +162,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 +174,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()  {