feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju.welcome</groupId>
 	<artifactId>mainbiz</artifactId>
-	<version>v5.3.0</version>
+	<version>v5.3.4</version>
 	<name>mainbiz</name>
 	<description>com.huiju.welcome main service</description>
 

src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java

@@ -27,6 +27,8 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
@@ -310,8 +312,8 @@ public class TaMainUsherRecordController extends BaseController {
      */
     @RequestMapping(value="/excel/usherListExcel",method= RequestMethod.GET)
     public void exportCustomerExcel(@RequestParam(value = "personName" ,required = false)String personName,
-                                    @RequestParam(value = "startTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
-                                    @RequestParam(value = "endTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
+                                    @RequestParam(value = "startTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") Date startTime,
+                                    @RequestParam(value = "endTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") Date endTime,
                                     @RequestParam(value = "customerType" ,required = false)String customerType,
                                     @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
                                     @RequestParam(value = "receiver" ,required = false)String receiver,
@@ -322,8 +324,8 @@ public class TaMainUsherRecordController extends BaseController {
         try {
             ServletOutputStream out = response.getOutputStream();
 
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
-            String fileName = LocalDateTime.now().format(formatter);
+            DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+            String fileName = formatter.format(null == startTime ? new Date() : startTime);
 
             response.setContentType("multipart/form-data");
             response.setCharacterEncoding("utf-8");
@@ -343,13 +345,14 @@ public class TaMainUsherRecordController extends BaseController {
     public ResponseBean usherRecords(@RequestParam(defaultValue = "1") int pageNum,
                                  @RequestParam(defaultValue = "10") int pageSize,
                                      @RequestParam(value = "personName" ,required = false)String personName,
-                                     @RequestParam(value = "startTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
-                                     @RequestParam(value = "endTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
+                                     @RequestParam(value = "startTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") Date startTime,
+                                     @RequestParam(value = "endTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") Date endTime,
                                      @RequestParam(value = "customerType" ,required = false)String customerType,
                                      @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
                                      @RequestParam(value = "receiver" ,required = false)String receiver,
                                      @RequestParam(value = "phone" ,required = false)String phone){
         ResponseBean result = new ResponseBean();
+
         result.addSuccess(iTaMainUsherRecordService.usherRecords(personName,phone,receiver,customerType,customerSource,startTime,endTime,pageNum,pageSize));
         return result;
     }

src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java

@@ -158,6 +158,8 @@ public class CameraServiceImpl implements ICameraService {
 
                     // 保留原来人员ID
                     personIdOrigin = taSnapshotPerson.getMatchPerson();
+                } else {
+                    taPerson.setAvatar(taSnapshotPerson.getAvatar());
                 }
             }
 

src/main/java/com.huiju.welcome/service/impl/MessageServiceImpl.java

@@ -82,7 +82,7 @@ public class MessageServiceImpl implements IMessageService {
         Boolean b1 = notifyConsultant(taCustomer);
         Boolean b2 = notifyManager(taCustomer);
 
-        return b1 || b2;
+.        return b1 || b2;
     }
 
     private boolean notifyCustomer2User(String openid, String phone, TaCustomer taCustomer) {

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -692,10 +692,10 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
                 UsherRecordExcel item = new UsherRecordExcel();
                 item.setCustomerSource(customer.getSourceName());
-                item.setCustomerType(customer.getCustomerType());
+                item.setCustomerType(CommConstant.CUSTOMER_OF_CHANNEL.equals(customer.getCustomerType()) ? "渠道" : "自销");
                 item.setPersonName(customer.getPersonName());
                 item.setPersonNum(customer.getVisitorNum());;
-                item.setPhone(customer.getPhone());
+                item.setPhone(StringUtils.mixPhone(customer.getPhone()));
                 item.setPlateNumber(customer.getPlateNumber());
                 item.setReceiver(customer.getReceiver());
                 item.setVisiteDate(customer.getVisiteDate());

src/main/java/com.huiju.welcome/utils/StringUtils.java

@@ -49,4 +49,12 @@ public class StringUtils {
 
         return codeNum;
     }
+
+    public static String mixPhone(String phone) {
+        if (isEmpty(phone) || phone.length() < 11) {
+            return phone;
+        }
+
+        return phone.replaceAll("(\\d{3})(\\d{4})(.*)", "$1****$3");
+    }
 }

src/main/resources/application.yml

@@ -1,12 +1,12 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-#    username: welcome
-#    password: s190QU2#z%hdU%^FPkY9qjls
-    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+    username: welcome
+    password: s190QU2#z%hdU%^FPkY9qjls
+#    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+#    username: root
+#    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
   servlet:
     multipart:
       max-file-size: 1024MB

src/main/resources/mapper/TaCustomerMapper.xml

@@ -67,28 +67,6 @@
         order by consultant_id, create_date desc
     </select>
 
-    <select id="getCustomersEqualCustomerPage" resultType="com.huiju.welcome.model.TaCustomer">
-        select * from ta_customer t
-        <where>
-            t.status &gt; -1
-            <if test="customerName !=null and customerName != ''">
-                and t.customer_name LIKE CONCAT('%',#{customerName},'%')
-            </if>
-
-            <if test="phone !=null and phone != ''">
-                and t.phone LIKE CONCAT('%',#{phone},'%')
-            </if>
-
-            <if test="platNumber !=null and platNumber != ''">
-                and t.plate_number LIKE CONCAT('%',#{platNumber},'%')
-            </if>
-            <if test="agentUserId != null">
-                and t.consultant_id = #{agentUserId}
-            </if>
-        </where>
-        order by consultant_id, create_date desc
-    </select>
-
     <select id="getSomeCustMayBe" resultType="com.huiju.welcome.model.TaCustomer">
         SELECT
             *