merge

.idea/workspace.xml

@@ -5,30 +5,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5dd66384-19bf-43a0-b6b4-b05d9b7b9cd4" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaWechatUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaWechatUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstpage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstpage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstpageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstpageServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -40,7 +29,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CameraController.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CameraController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="223">
@@ -53,6 +42,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="TaMainUsherRecordMapper.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="535">
+              <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="SysUserController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -71,6 +69,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="TaMainUsherRecordServiceImpl.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="336">
+              <caret line="178" column="4" selection-start-line="178" selection-start-column="4" selection-end-line="178" selection-end-column="4" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -174,12 +184,12 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/Action.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -459,12 +469,12 @@
       <workItem from="1560923587540" duration="24987000" />
       <workItem from="1561084889145" duration="26895000" />
       <workItem from="1561339069413" duration="2416000" />
-      <workItem from="1561343517448" duration="18391000" />
+      <workItem from="1561343517448" duration="18751000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="354986000" />
+    <option name="totallyTimeSpent" value="355346000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
@@ -480,9 +490,9 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" visible="true" weight="0.19612315" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" weight="0.49714938" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="8" weight="0.19156215" />
+      <window_info active="true" anchor="bottom" id="Messages" order="8" visible="true" weight="0.29874572" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
@@ -490,7 +500,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49903476" weight="0.45381984" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.19840364" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.45381984" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20309168" />
       <window_info anchor="right" id="Bean Validation" order="3" weight="0.32928804" />
       <window_info id="Web" order="2" side_tool="true" />
@@ -530,13 +540,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
-          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="439">
@@ -791,16 +794,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1241">
-          <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaFollowupRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
@@ -922,6 +915,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="535">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="178" column="4" selection-start-line="178" selection-start-column="4" selection-end-line="178" selection-end-column="4" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -151,12 +151,12 @@ public class TaFirstUsherRecordController extends BaseController {
     }
 
     @RequestMapping(value="/firstUsherRecord",method= RequestMethod.GET)
-    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNum,
                              @RequestParam(defaultValue = "10") int pageSize,
                              @RequestParam(value = "plateNumber",required = false) String plateNumber,
                              @RequestParam(value = "visiteDate",required = false) String visiteDate){
             ResponseBean responseBean = new ResponseBean();
-            IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
+            IPage<TaFirstUsherRecord> pg = new Page<>(pageNum, pageSize);
             IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
             responseBean.addSuccess(result);
             return responseBean;

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

@@ -217,20 +217,22 @@ public class TaFirstpageController extends BaseController {
     })
     @RequestMapping(value = "/firstpage/{firstpageId}", method = RequestMethod.GET)
     public ResponseBean get(@PathVariable int firstpageId, HttpServletRequest request) {
-        return detail(firstpageId, "", request);
+        return detail(firstpageId, "", request,null);
     }
 
     @ApiOperation(value = "前端获取指定首屏内容", notes = "前端获取指定首屏内容")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataType = "String", name = "deviceId", value = "设备ID"),
+            @ApiImplicitParam(paramType = "Query", dataType = "String", name = "weatherName", value = "天气名称")
     })
     @RequestMapping(value = "/screen/fristpage/device/{deviceId}", method = RequestMethod.GET)
-    public ResponseBean screenGet(@PathVariable String deviceId, HttpServletRequest request) {
-        return detail(0, deviceId, request);
+    public ResponseBean screenGet(@PathVariable String deviceId, HttpServletRequest request,
+                                  @RequestParam(value ="weatherName",required = false)String weatherName) {
+        return detail(0, deviceId, request,weatherName);
     }
 
     // getDetail 获取首屏详情
-    private ResponseBean detail(int firstpageId, String deviceId, HttpServletRequest request) {
+    private ResponseBean detail(int firstpageId, String deviceId, HttpServletRequest request,String weatherName) {
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<TaFirstpage> q = new QueryWrapper<>();
@@ -245,7 +247,8 @@ public class TaFirstpageController extends BaseController {
             responseBean.addError(HttpStatus.SC_NOT_FOUND, "内容不存在");
             return responseBean;
         }
-
+        //天气值weatherName
+        taFirstpage.setWeatherName(weatherName);
         // 获取内容
         Map<String, Object> ctt = taFirstpageService.detail(taFirstpage);
         responseBean.addSuccess(ctt);

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

@@ -222,13 +222,27 @@ public class TaMainUsherRecordController extends BaseController {
     }
 
     @RequestMapping(value="/mainUsherRecord",method= RequestMethod.GET)
-    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
-                            @RequestParam(defaultValue = "10") int pageSize){
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNum,
+                            @RequestParam(defaultValue = "10") int pageSize,
+                             @RequestParam(value = "phone",required = false) String phone,
+                             @RequestParam(value = "platNumber",required = false) String platNumber,
+                             @RequestParam(value = "personName",required = false) String personName,
+                             @RequestParam(value = "appointment",required = false) Integer appointment){
         ResponseBean responseBean = new ResponseBean();
 
-        IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
-        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.taMainUsherRecordList(pg);
+        IPage<TaMainUsherRecord> pg = new Page<>(pageNum, pageSize);
+        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.taMainUsherRecordList(pg,phone,platNumber,personName,appointment);
         responseBean.addSuccess(result);
         return responseBean;
     }
+
+    @RequestMapping(value="/customerList",method= RequestMethod.GET)
+    public ResponseBean customer(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "customerName" ,required = false)String customerName,
+                                 @RequestParam(value = "phone" ,required = false)String phone,
+                                 @RequestParam(value = "platNumber" ,required = false)String platNumber){
+        ResponseBean result = iTaMainUsherRecordService.customerPage(pageNum, pageSize,customerName,phone,platNumber);
+        return result;
+    }
 }

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

@@ -121,19 +121,18 @@ public class TaVisitorAppointmentController extends BaseController {
             return ResponseBean.error("更新数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
-    @ApiOperation(value = "访客预约信息",httpMethod = "访客预约信息")
+    @ApiOperation(value = "访客预约信息",notes = "访客预约信息")
     @RequestMapping(value="/visitorAppointmentList",method= RequestMethod.GET)
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "platNumber", value = "车牌"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "personName", value = "预约人姓名"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "预约人电话")})
-    public ResponseBean visitorAppointmentList(@RequestParam(defaultValue = "1") int pageNumber,
-                             @RequestParam(defaultValue = "10") int pageSize,
-                             @RequestParam(value = "platNumber",required = false) String platNumber,
-                             @RequestParam(value = "personName",required = false) String personName,
-                             @RequestParam(value = "phone",required = false) String phone){
-
-        IPage<TaVisitorAppointment> pg = new Page<>(pageNumber, pageSize);
+    public ResponseBean visitorAppointmentList(@RequestParam(defaultValue = "1") int pageNum,
+                                               @RequestParam(defaultValue = "10") int pageSize,
+                                               @RequestParam(value = "platNumber",required = false) String platNumber,
+                                               @RequestParam(value = "personName",required = false) String personName,
+                                               @RequestParam(value = "phone",required = false) String phone){
+        IPage<TaVisitorAppointment> pg = new Page<>(pageNum, pageSize);
         ResponseBean result = taVisitorAppointmentService.visitorAppointmentList(pg,platNumber,personName,phone);
         return result;
     }

src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaCustomer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,4 +18,5 @@ import org.apache.ibatis.annotations.Param;
 public interface TaCustomerMapper extends BaseMapper<TaCustomer> {
 
     TaCustomer getCustomerOf(@Param("personId") Integer personId, @Param("realId") Integer realId);
+    IPage<TaCustomer> customerPage(IPage<TaCustomer> pg, String customerName, String phone, String platNumber);
 }

src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java

@@ -30,4 +30,5 @@ public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
     IPage<TaMainUsherRecord> aMainUsherRecordList(IPage<TaMainUsherRecord> pg);
 
     List<TaMainUsherRecord> getLastList(@Param("personId") Integer personId, @Param("dt") LocalDateTime dt);
+    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,@Param("phone")String phone,@Param("platNumber")String platNumber,@Param("personName")String personName,@Param("appointment")Integer appointment);
 }

src/main/java/com.huiju.welcome/model/TaFirstpage.java

@@ -38,6 +38,12 @@ public class TaFirstpage implements Serializable {
 
     private Integer status;
 
+    /**
+     * 前端获取指定首屏内容输入动态名称
+     */
+    @TableField(exist = false)
+    private  String weatherName;
+
     @TableField(exist = false)
     private List<TaFirstpageContent> content;
 

src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java

@@ -2,6 +2,7 @@ package com.huiju.welcome.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
 
@@ -18,16 +19,17 @@ import java.util.List;
 public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     boolean updateNormal(List<TaMainUsherRecord> recs);
-    /**
-     * 分页查询大厅记录
-     * @param pg
-     * @return
-     */
-    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg);
 
     void notifyConsultant(TaMainUsherRecord taMainUsherRecord, TaCustomer taCustomer) throws Exception;
 
     boolean newRecordByDevice(TaCustomer taCustomer);
 
     boolean newRecordByConsultant(TaCustomer taCustomer);
+    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,String phone,String platNumber,String personName,Integer appointment);
+
+    /**
+     * 查询客户列表
+     * @return
+     */
+    ResponseBean customerPage(int pageNum, int pageSize, String customerName, String phone, String platNumber);
 }

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

@@ -43,7 +43,7 @@ public class TaFirstpageServiceImpl extends ServiceImpl<TaFirstpageMapper, TaFir
 
         // 获取天气
         if (taFirstpage.getWeatherShow()) {
-            res.put("weather",  saWeather.weather());
+            res.put("weather",  saWeather.weather(taFirstpage));
         }
 
         // 获取公告

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.common.Action;
 import com.huiju.welcome.common.WebSocketServer;
@@ -11,6 +12,11 @@ import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
 import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
 import com.huiju.welcome.mapper.TaWechatUserMapper;
 import com.huiju.welcome.model.*;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.mapper.TaCustomerMapper;
+import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
+import com.huiju.welcome.model.TaCustomer;
+import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.MiniApp;
@@ -34,7 +40,10 @@ import java.util.List;
 @Service
 public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordMapper, TaMainUsherRecord> implements ITaMainUsherRecordService {
     @Autowired
-    TaMainUsherRecordMapper taMainUsherRecordMapper;
+    private TaMainUsherRecordMapper taMainUsherRecordMapper;
+
+    @Autowired
+    private TaCustomerMapper taCustomerMapper;
 
     @Autowired
     TaVisitorAppointmentMapper taVisitorAppointmentMapper;
@@ -107,8 +116,8 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg) {
-        IPage<TaMainUsherRecord>  taMainUsherRecordList= taMainUsherRecordMapper.aMainUsherRecordList(pg);
+    public IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,String phone,String platNumber,String personName,Integer appointment) {
+        IPage<TaMainUsherRecord>  taMainUsherRecordList= taMainUsherRecordMapper.taMainUsherRecordList(pg,phone,platNumber,personName,appointment);
         return taMainUsherRecordList;
     }
 
@@ -168,4 +177,11 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             miniApp.sendTPLMessage(tplId, openid, page, dt2);
         }
     }
+    public ResponseBean customerPage(int pageNum, int pageSize, String customerName, String phone, String platNumber) {
+        ResponseBean response = new ResponseBean();
+        IPage<TaCustomer> pg = new Page<>(pageNum, pageSize);
+        IPage<TaCustomer> result = taCustomerMapper.customerPage(pg,customerName,phone,platNumber);
+        response.addSuccess(result);
+        return response;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.welcome.utils;
 
+import com.huiju.welcome.model.TaFirstpage;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -42,9 +43,11 @@ public class SAWeather {
     @Value("${saweather.needMoreDay}")
     private String needMoreDay;
 
-    public String weather() {
+    public String weather(TaFirstpage taFirstpage) {
         List<String> params = new ArrayList<>();
-        params.add("area=" + city);
+        // WeatherName 为空时 显示默认
+        String temporaryCity = org.springframework.util.StringUtils.isEmpty(taFirstpage.getWeatherName()) ? city:taFirstpage.getWeatherName();
+        params.add("area=" + temporaryCity);
         params.add("needIndex=" + needIndex);
         params.add("need3HourForcast=" + need3HourForcast);
         params.add("needAlarm=" + needAlarm);

src/main/resources/mapper/TaCustomerMapper.xml

@@ -18,4 +18,21 @@
             )
             LIMIT 1
     </select>
+    <select id="customerPage" resultType="com.huiju.welcome.model.TaCustomer">
+        select * from ta_customer
+        <where>
+            <if test="customerName !=null and customerName != ''">
+                and customer_name LIKE CONCAT('%',#{customerName},'%')
+            </if>
+
+            <if test="phone !=null and phone != ''">
+                and phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+
+            <if test="platNumber !=null and platNumber != ''">
+                and   plate_number LIKE CONCAT('%',#{platNumber},'%')
+            </if>
+        </where>
+        order by create_date desc
+    </select>
 </mapper>

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -10,11 +10,28 @@
         WHERE
             t.customer_id = #{customerId}
     </select>
-    <select id="aMainUsherRecordList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
+    <select id="taMainUsherRecordList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
         SELECT
         *
         FROM
         ta_main_usher_record
+        <where>
+            <if test="phone !=null and phone !=''">
+                phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="platNumber !=null and platNumber !=''">
+                plate_number LIKE CONCAT('%',#{platNumber},'%')
+            </if>
+
+            <if test="personName !=null and personName !=''">
+                person_name LIKE CONCAT('%',#{personName},'%')
+            </if>
+
+            <if test="appointment !=null">
+                appointment =#{appointment}
+            </if>
+        </where>
+        order by visite_date desc
     </select>
     <select id="getLastList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
         SELECT