添加重新解析按钮

suishenbang-order/src/main/resources/templates/order/orderbase/orderbase.html

@@ -55,7 +55,10 @@
                             </div>
                         </div>
                         <div class="form-group col-sm-4 row">
-
+                            <!--<label class="control-label col-sm-4">期望到货时间：</label>-->
+                            <!--<div class="input-group col-sm-8">-->
+                            <!--<input class="form-control" type="text" name="salesOrgName"/>-->
+                            <!--</div>-->
                         </div>
                         <div class="form-group col-sm-4 row">
                             <div class="form-group" style="float: right;">

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -63,14 +63,19 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
     @Async
     public SyncLog analysisSysUser(String packageId){
         MetaEmployeeDiy param = new MetaEmployeeDiy();
-        param.setPackageId(packageId);
-
+        if(packageId==null||packageId.trim().equals("")){
+            Long l = new Date().getTime();
+            packageId = l.toString();
+        }else{
+            param.setPackageId(packageId);
+        }
+        List<MetaEmployeeDiy> metaEmployeeDiys = metaEmployeeDiyMapper.selectMetaEmployeeDiyList(param);
         SyncLog syncLog = new SyncLog();
         syncLog.setSyncType("sysuser");
         syncLog.setStartTime(new Date());
 
         Set<String> loginNameList = sysUserService.selectAllUserLoginName();
-        List<MetaEmployeeDiy> metaEmployeeDiys = metaEmployeeDiyMapper.selectMetaEmployeeDiyList(param);
+
 
         syncLog.setPackageId(packageId);
         syncLog.setTotalCount((long)metaEmployeeDiys.size());

suishenbang-sync/suishenbang-sync-common/src/main/resources/mapper/sync/SyncFailDetailMapper.xml

@@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSyncFailDetailVo"/>
         <where>  
             <if test="packageId != null  and packageId != ''"> and package_id = #{packageId}</if>
-            <if test="failReason != null  and failReason != ''"> and fail_reason = #{failReason}</if>
-            <if test="dataJson != null  and dataJson != ''"> and data_json = #{dataJson}</if>
+            <if test="failReason != null  and failReason != ''"> and fail_reason like concat('%',  #{failReason},'%')</if>
+            <if test="dataJson != null  and dataJson != ''"> and data_json like concat('%', #{dataJson}, '%') </if>
             <if test="failLevel != null  and failLevel != ''"> and fail_level = #{failLevel}</if>
             <if test="exceptionType != null  and exceptionType != ''"> and exception_type = #{exceptionType}</if>
         </where>

suishenbang-sync/suishenbang-sync-manager/src/main/java/com/dgtly/sync/controller/SyncController.java

@@ -74,4 +74,6 @@ public class SyncController {
 
 
 
+
+
 }

suishenbang-sync/suishenbang-sync-manager/src/main/java/com/dgtly/sync/controller/SyncLogController.java

@@ -3,6 +3,7 @@ package com.dgtly.sync.controller;
 import java.util.List;
 
 import com.dgtly.sync.domain.SyncFailDetail;
+import com.dgtly.sync.service.IAnalysisSysUserService;
 import com.dgtly.sync.service.ISyncFailDetailService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +35,8 @@ public class SyncLogController extends BaseController
 
     @Autowired
     private ISyncLogService syncLogService;
-
+    @Autowired
+    private IAnalysisSysUserService analysisSysUserService;
 
     @Autowired
     private ISyncFailDetailService syncFailDetailService;
@@ -98,5 +100,21 @@ public class SyncLogController extends BaseController
     }
 
 
+    /**
+     * 解析用户数据
+     * @return
+     */
+    @RequiresPermissions("sync:synclog:resyncuser")
+    @GetMapping("reSyncUser")
+    @ResponseBody
+    public Object user(){
+        try{
+            analysisSysUserService.analysisSysUser(null);
+        }catch (Exception e){
+            logger.error("解析用户出错",e);
+        }
+        return AjaxResult.success();
+    }
+
 
 }

suishenbang-sync/suishenbang-sync-manager/src/main/resources/templates/sync/synclog/syncfaildetail.html

@@ -35,6 +35,25 @@
                             </select>
                         </div>
                     </div>
+                    <div class="row">
+                        <label class="control-label col-sm-2  ">原因包含：</label>
+                        <div class="col-sm-4 ">
+                            <input class="form-control" type="text" name="failReason" th:value="${failReason}">
+                        </div>
+                        <label class="control-label col-sm-2  ">数据包含：</label>
+                        <div class="col-sm-4 ">
+                            <input class="form-control" type="text" name="dataJson" th:value="${dataJson}">
+                        </div>
+
+                    </div>
+                    <data class="row">
+                        <div class="form-group col-sm-4 row ">
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </div>
+
+                    </data>
+
                 </form>
             </div>
             <div class="col-sm-12 select-table table-striped">

suishenbang-sync/suishenbang-sync-manager/src/main/resources/templates/sync/synclog/synclog.html

@@ -59,8 +59,8 @@
             </div>
             <div class="btn-group-sm" id="toolbar" role="group">
 
-                <a class="btn btn-success" onclick="reSyncUser()" shiro:hasPermission="sync:synclog:resyncuser">
-                    <i class="fa fa-repeat"></i> 重新DIY销售
+                <a class="btn btn-success" onclick="reSyncUser()" shiro:hasPermission="sync.synclog.resyncuser">
+                    <i class="fa fa-repeat"></i> 重新解析DIY销售
                 </a>
             </div>
 
@@ -152,7 +152,12 @@
         });
 
         function reSyncUser(){
-            $.operate.get(ctx+"/interface/sync/user");
+
+            $.ajax({
+                url: ctx+"/sync/synclog/reSyncUser",
+                type: "get"
+            })
+            $.modal.msgSuccess("解析已成功请稍后查看解析日志");
         }
     </script>
 </body>

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -119,14 +119,14 @@
          LEFT JOIN sys_role ro on ur.role_id = ro.role_id
         <where>
             ur.user_id = #{userId}
-            <if test="magnetName != null and magnetName != ''">
-                AND m.magnet_name like concat('%', #{magnetName}, '%')
+            <if test="wxMagnet.magnetName != null and wxMagnet.magnetName != ''">
+                AND m.magnet_name like concat('%', #{wxMagnet.magnetName}, '%')
             </if>
-            <if test="visible != null and visible != ''">
+            <if test="wxMagnet.visible != null and wxMagnet.visible != ''">
                 AND m.visible = #{visible}
             </if>
-            <if test="magnetSize != null and magnetSize != ''">
-                AND m.magnetSize = #{magnet_size}
+            <if test="wxMagnet.magnetSize != null and wxMagnet.magnetSize != ''">
+                AND m.magnetSize = #{wxMagnet.magnet_size}
             </if>
             ${params.dataScope}
         </where>