From 2d28d91d6ca70f8b60a24f6807ff1a2d1e117eb2 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 11:16:09 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java | 56 ++++++++++++++++++
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java | 13 ++++
flower_city/src/main/java/com/dg/core/util/WxUtil.java | 27 +++++++++
flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml | 5 +
flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java | 24 ++++++++
flower_city/src/main/resources/mapper/SysUserMapper.xml | 3 +
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 26 ++++++++
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java | 16 +++++
flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java | 4 +
9 files changed, 172 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
index 041670a..843ca2e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/CommonController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -1,11 +1,14 @@
package com.dg.core.controller;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.dg.core.CorsConfig;
import com.dg.core.ResultData;
import com.dg.core.db.gen.AjaxResult;
import com.dg.core.file.FtpConstants;
import com.dg.core.file.MimeTypeUtils;
import com.dg.core.file.SFTPUtil;
+import com.dg.core.util.TestDate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -34,6 +38,7 @@
@Autowired
private CorsConfig corsConfig;
+
// FTP 登录用户名
@@ -127,13 +132,30 @@
return ResultData.error("上传文件失败 "+e.getMessage());
}
-
// AjaxResult ajax = new AjaxResult();
// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ }
-
+ /**
+ * 通用上传请求（多个）
+ */
+ @ApiOperation("判断当前时间是否是工作日")
+ @GetMapping("/isWeekday")
+ public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
+ {
+ TestDate td=new TestDate();
+ DateTime dateTimeUser;
+ if (dateTime==null)
+ dateTimeUser=DateTime.now();
+ else{
+ dateTimeUser=DateUtil.parse(dateTime);
+ }
+ if (td.isWeekday(dateTimeUser))
+ return success("工作日");
+ else
+ return success("休息日或者周末");
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java
new file mode 100644
index 0000000..704cb9f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java
@@ -0,0 +1,56 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户访问记录
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-15
+ */
+@TableName("automessage_sys_user_record")
+@Data
+@ApiModel("用户访问记录类")
+public class AutomessageSysUserRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ private Integer userId;
+
+ /**
+ * 访问时间
+ */
+ @ApiModelProperty("访问时间")
+ private LocalDateTime createTime;
+
+ /**
+ * 进入方式(1.扫码进入 2.花城进入 3.分享进入)
+ */
+ @ApiModelProperty("进入方式(1.扫码进入 2.花城进入 3.分享进入)")
+ private Integer joinType;
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
index d07e538..74d5930 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -181,6 +181,19 @@
@ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
private Integer serviceState;
+ /**
+ * 超时时间
+ */
+ @ApiModelProperty("超时时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime timeoutTime;
+
+ /**
+ * 是否推送过（1 是 2 否）
+ */
+ @ApiModelProperty("是否推送过（1 是 2 否）")
+ private Integer isPush;
+
@TableField(exist = false)
@ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
private String sumClassifyName;
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java
new file mode 100644
index 0000000..16d1531
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java
@@ -0,0 +1,16 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.AutomessageSysUserRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-15
+ */
+public interface AutomessageSysUserRecordMapper extends BaseMapper<AutomessageSysUserRecord> {
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java
new file mode 100644
index 0000000..5e765cf
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java
@@ -0,0 +1,4 @@
+package com.dg.core.service;
+
+public interface ISysUserRecordService {
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java
new file mode 100644
index 0000000..795b7e9
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java
@@ -0,0 +1,24 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.AutomessageSysUserRecord;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.mapper.AutomessageSysUserRecordMapper;
+import com.dg.core.db.gen.mapper.SysUserMapper;
+import com.dg.core.service.ISysUserRecordService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class SysUserRecordServiceImpl extends ServiceImpl<AutomessageSysUserRecordMapper, AutomessageSysUserRecord> implements ISysUserRecordService {
+
+ @Resource
+ private SysUserMapper sysUserMapper;
+
+ public ResultData add(SysUser sysUser){
+ return null;
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/WxUtil.java b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
index bb39e08..c75e205 100644
--- a/flower_city/src/main/java/com/dg/core/util/WxUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
@@ -215,5 +215,32 @@
}
+ /**
+ * 工单超时推送
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ */
+ public void sendGuideRepairOrderOvertime(String openId, String accessToken, String templateId, GuideRepairOrder guideRepairOrder){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ Calendar calendar = Calendar.getInstance();
+ paras.add(new TemplateParam("thing4","给您分配的工单:'"+guideRepairOrder.getMatterName()+"',已超时请即使处理"));//超时提示内容
+ paras.add(new TemplateParam("thing2",guideRepairOrder.getConsultUserName()));//咨询人
+ paras.add(new TemplateParam("thing3",guideRepairOrder.getConsultContent()));//咨询内容
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+
+
}
diff --git a/flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml b/flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml
new file mode 100644
index 0000000..28ad48b
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSysUserRecordMapper">
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
index f4541fa..c52bb1f 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -91,6 +91,9 @@
<include refid="selectSysUserVo"/>
<where>
user_type=#{userType}
+ <if test="keyWord!=null and keyWord!=''">
+ and (transaction_names like concat('%',#{keyWord}, '%') or user_name like concat('%',#{keyWord}, '%'))
+ </if>
</where>
ORDER BY department_id
</select>
--
Gitblit v1.7.1