qxm-修改数据解析根据是否同步字段进行解析，磁铁访问日志导出增加访问时间

suishenbang-admin/src/main/resources/templates/system/user/edit.html

@@ -104,6 +104,19 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">是否同步：</label>
+                        <div class="col-sm-8">
+                            <label class="toggle-switch switch-solid">
+                                <input type="checkbox" id="isSync" th:checked="${user.isSync == '0' ? true : false}">
+                                <span></span>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <h4 class="form-header h4" style="line-height: 2.1;">扩展信息
                 <div style="float: right" shiro:hasPermission="system.user.editExt">
                     <button type="button" class="btn btn-sm btn-primary" onclick="seletDiyExt()"><i class="fa fa-check"></i>设置为自定义</button>&nbsp;
@@ -335,9 +348,11 @@
 	        if ($.validate.form()) {
 	        	var data = $("#form-user-edit").serializeArray();
 	        	var status = $("input[id='status']").is(':checked') == true ? 0 : 1;
+	        	var isSync = $("input[id='isSync']").is(':checked') == true ? 0 : 1;
 	        	var roleIds = $.form.selectCheckeds("role");
 	        	var postIds = $.form.selectSelects("post");
 	        	data.push({"name": "status", "value": status});
+	        	data.push({"name": "isSync", "value": isSync});
 	        	data.push({"name": "roleIds", "value": roleIds});
 	        	data.push({"name": "postIds", "value": postIds});
 	        	$.operate.saveTab(prefix + "/edit", data);

suishenbang-system/src/main/java/com/dgtly/system/domain/SysMagnetLog.java

@@ -1,10 +1,13 @@
 package com.dgtly.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.dgtly.common.annotation.Excel;
 import com.dgtly.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 磁铁日志对象 sys_magnet_log
  * 
@@ -42,6 +45,10 @@ public class SysMagnetLog extends BaseEntity
     @Excel(name = "磁铁名称")
     private String magnetName;
 
+    /** 创建时间 */
+    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -106,6 +113,16 @@ public class SysMagnetLog extends BaseEntity
         return magnetName;
     }
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -124,6 +124,9 @@ public class SysUser extends BaseEntity
     /*企业认证时间*/
     private Date orgAttestationTime;
 
+    /** 是否同步 */
+    private String  isSync;
+
     //    /** 所属销售组织等级 详见字典（sales_level） */
 //    private String salesLevel;
 //
@@ -508,6 +511,14 @@ public class SysUser extends BaseEntity
         this.sysUserExtLsit = sysUserExtLsit;
     }
 
+    public String getIsSync() {
+        return isSync;
+    }
+
+    public void setIsSync(String isSync) {
+        this.isSync = isSync;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserServiceImpl.java

@@ -268,6 +268,10 @@ public class SysUserServiceImpl implements ISysUserService
         // 删除用户与角色关联
         SysUser u =  userMapper.selectUserByLoginName(user.getLoginName());
         SysUserExt userExt = user.getSysUserExt();
+        /*判断同步标识is_sync=1不需要同步*/
+        if("1".equals(u.getIsSync())){
+            return 1;
+        }
         if(userExt!=null){
             userExt.setUserId(u.getUserId());
             userExtMapper.insertOrUpSysUserExt(userExt);

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
 		<result property="isConsignee"       column="is_consignee"       />
+		<result property="isSync"       column="is_sync"       />
 		<result property="isAuthentication"       column="is_authentication"       />
 		<result property="personAttestationTime"       column="person_attestation_time"       />
 		<result property="isOrgAuthentication"       column="is_org_authentication"       />
@@ -85,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectUserVo">
         select  u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.status,
-        		u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,
+        		u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,is_sync,
         		c.company_name,
        		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
@@ -270,6 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="isConsignee != null">is_consignee = #{isConsignee},</if>
+ 			<if test="isSync != null">is_sync = #{isSync},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}