1.预警分析

tnc-base/tnc-base-core/src/main/java/org/jeecg/common/api/vo/Result.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import org.jeecg.common.constant.CommonConstant;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  *   接口返回数据格式
@@ -43,6 +44,12 @@ public class Result<T> implements Serializable {
 	 */
 	@ApiModelProperty(value = "返回数据对象")
 	private T result;
+
+	@ApiModelProperty(value = "返回数据对象")
+	private Object data;
+
+	@ApiModelProperty(value = "返回数据对象")
+	private List resultList;
 	
 	/**
 	 * 时间戳
@@ -94,6 +101,21 @@ public class Result<T> implements Serializable {
 		r.setResult(data);
 		return r;
 	}
+	public static<T> Result<T> ok(List data) {
+		Result<T> r = new Result<T>();
+		r.setSuccess(true);
+		r.setCode(CommonConstant.SC_OK_200);
+		r.setResultList(data);
+		return r;
+	}
+
+	public static<T> Result<T> object(Object data) {
+		Result<T> r = new Result<T>();
+		r.setSuccess(true);
+		r.setCode(CommonConstant.SC_OK_200);
+		r.setData(data);
+		return r;
+	}
 
 	public static<T> Result<T> OK() {
 		Result<T> r = new Result<T>();

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -21,9 +21,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoLog;
-import org.jeecg.modules.smscheck.entity.SmsCheckWorkLog;
+import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoLogService;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
 import org.jeecg.modules.smscheck.service.ISmsCheckWorkLogService;
@@ -31,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
@@ -56,6 +55,8 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     private ISmsCheckCustomerInfoLogService infoLogService;
     @Autowired
     private ISysBaseAPI sysBaseAPI;
+    @Autowired
+    private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
 
     /**
      * 分页列表查询
@@ -377,5 +378,44 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return Result.OK("添加成功！");
     }
 
+    @PostMapping(value = "/checkInfo/warning/count")
+    public Result<String> checkInfoWarningCount(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String workNo = sysUser.getWorkNo();
+        if (StringUtils.isEmpty(workNo)){
+            return Result.error("该用户不存在");
+        }
+        smsCheckCustomerInfo.setStaffNo(workNo);
+        Integer count =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        if (count == null){
+            return Result.error("该用户没有相关信息");
+        }
+        return Result.OK(count.toString());
+    }
+
+    @PostMapping(value = "/checkInfo/warning/all/count")
+    public Result<String> checkInfoWarningCountAll(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_0);
+        Integer count0 =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
+        Integer count1 =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
+        Integer count4 =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        SmsCheckCustomerInfoVo smsCheckCustomerInfoVo = new SmsCheckCustomerInfoVo();
+        smsCheckCustomerInfoVo.setCheckState0(count0);
+        smsCheckCustomerInfoVo.setCheckState1(count1);
+        smsCheckCustomerInfoVo.setCheckState4(count4);
+        return Result.object(smsCheckCustomerInfoVo);
+    }
 
+    @PostMapping(value = "/checkInfo/warning/count/time")
+    public Result<String> checkInfoWarningCountTime(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        List<SmsCheckTaskVo> smsCheckTaskVos = smsCheckCustomerInfoService.checkInfoWarningCountTime(smsCheckCustomerInfo);
+        return Result.ok(smsCheckTaskVos);
+    }
+    @PostMapping(value = "/checkInfo/warning/count/staff")
+    public Result<String> checkInfoWarningCountStaff(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        List<SmsCheckTaskVo> smsCheckTaskVos = smsCheckCustomerInfoService.checkInfoWarningCountStaff(smsCheckCustomerInfo);
+        return Result.ok(smsCheckTaskVos);
+    }
  }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerInfoVo.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.smscheck.entity;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SmsCheckCustomerInfoVo {
+    private Integer checkState0;
+    private Integer checkState1;
+    private Integer checkState4;
+    private List<SmsCheckTaskVo> list;
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckTaskVo.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.smscheck.entity;
+
+import lombok.Data;
+
+@Data
+public class SmsCheckTaskVo extends SmsCheckTask {
+    private Integer count;
+    private String date;
+    private String staffInfo;
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -1,7 +1,13 @@
 package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.apache.ibatis.annotations.SelectProvider;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoVo;
+import org.jeecg.modules.smscheck.entity.SmsCheckTaskVo;
+
+import java.util.List;
 
 /**
  * @description 客户信息
@@ -11,4 +17,63 @@ import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
  */
 public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerInfo> {
 
+    @SelectProvider(type = ProviderClass.class,method = "checkInfoWarningCount")
+    Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo);
+
+    @SelectProvider(type = ProviderClass.class,method = "checkInfoWarningCountTime")
+    List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo);
+
+    @SelectProvider(type = ProviderClass.class,method = "checkInfoWarningCountStaff")
+    List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo);
+
+    class ProviderClass{
+        public String checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo){
+            StringBuilder sql = new StringBuilder();
+            sql.append("SELECT COUNT(1) " +
+                    "FROM sms_check_customer_info scci " +
+                    "LEFT JOIN sms_check_task sct ON sct.id = scci.task_id");
+            sql.append(" where NOW() > sct.task_end_time");
+            if(StringUtils.isNotBlank(smsCheckCustomerInfo.getStaffNo())){
+                sql.append(" AND scci.staff_no = '" + smsCheckCustomerInfo.getStaffNo() + "'");
+            }
+            if (smsCheckCustomerInfo.getCheckState() != null){
+                sql.append(" AND scci.check_state = " + smsCheckCustomerInfo.getCheckState());
+            }
+            return sql.toString();
+
+        }
+
+        public String checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo){
+            StringBuilder sql = new StringBuilder();
+            sql.append("SELECT COUNT(1) count,DATE_FORMAT( sct.task_end_time, '%Y%m%d' ) date");
+            sql.append(" FROM sms_check_customer_info scci");
+            sql.append(" LEFT JOIN sms_check_task sct ON sct.id = scci.task_id");
+            sql.append(" WHERE NOW() > sct.task_end_time");
+            if (smsCheckCustomerInfo.getCheckState() != null){
+                sql.append(" AND scci.check_state = " + smsCheckCustomerInfo.getCheckState());
+            }
+            if(StringUtils.isNotBlank(smsCheckCustomerInfo.getStaffNo())){
+                sql.append(" AND scci.staff_no = '" + smsCheckCustomerInfo.getStaffNo() + "'");
+            }
+            sql.append(" GROUP BY sct.task_end_time");
+            sql.append(" ORDER BY sct.task_end_time ASC");
+
+            return sql.toString();
+        }
+
+
+        public String checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo){
+            StringBuilder sql = new StringBuilder();
+            sql.append(" SELECT COUNT(1) count,scci.staff_info staffInfo");
+            sql.append(" FROM sms_check_customer_info scci");
+            sql.append(" LEFT JOIN sms_check_task sct ON sct.id=scci.task_id");
+            sql.append(" WHERE NOW()> sct.task_end_time");
+            sql.append(" AND scci.check_state IN (0,1,4)");
+            sql.append(" GROUP BY scci.staff_info");
+            return sql.toString();
+
+        }
+
+
+    }
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckCustomerInfoService.java

@@ -2,6 +2,10 @@ package org.jeecg.modules.smscheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoVo;
+import org.jeecg.modules.smscheck.entity.SmsCheckTaskVo;
+
+import java.util.List;
 
 /**
  * @description 客户信息
@@ -11,4 +15,9 @@ import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
  */
 public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerInfo> {
 
+    Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo);
+
+    List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo);
+
+    List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo);
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckCustomerInfoServiceImpl.java

@@ -1,12 +1,17 @@
 package org.jeecg.modules.smscheck.service.impl;
 
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoVo;
+import org.jeecg.modules.smscheck.entity.SmsCheckTaskVo;
 import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerInfoMapper;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @description 客户信息
  * @author jeecg-boot
@@ -15,5 +20,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustomerInfoMapper, SmsCheckCustomerInfo> implements ISmsCheckCustomerInfoService {
+    @Autowired
+    private SmsCheckCustomerInfoMapper smsCheckCustomerInfoMapper;
+    @Override
+    public Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        return smsCheckCustomerInfoMapper.checkInfoWarningCount(smsCheckCustomerInfo)  ;
+    }
+
+    @Override
+    public List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        return smsCheckCustomerInfoMapper.checkInfoWarningCountTime(smsCheckCustomerInfo);
+    }
 
+    @Override
+    public List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        return smsCheckCustomerInfoMapper.checkInfoWarningCountStaff(smsCheckCustomerInfo);
+    }
 }