登录日志bean调整

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/LoginLog.java

@@ -28,6 +28,42 @@ public class LoginLog implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 登录用户ID
+     */
+    @TableField("login_id")
+    private Long loginId;
+
+    /**
+     * 登录用户名
+     */
+    @TableField("login_name")
+    private String loginName;
+
+    /**
+     * 登录日期
+     */
+    @TableField("login_date")
+    private Date loginDate;
+
+    /**
+     * 登录ip
+     */
+    @TableField("login_ip")
+    private Integer loginIp;
+
+    /**
+     * 登录ip地址
+     */
+    @TableField("login_address")
+    private String loginAddress;
+
+    /**
+     * 浏览器
+     */
+    @TableField("login_browser")
+    private String loginBrowser;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/OperationLog.java

@@ -28,6 +28,72 @@ public class OperationLog implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 操作人用户ID
+     */
+    @TableField("operation_id")
+    private Long operationId;
+
+    /**
+     * 操作人用户名
+     */
+    @TableField("operation_name")
+    private String operationName;
+
+    /**
+     * 操作日期
+     */
+    @TableField("operation_date")
+    private Date operationDate;
+
+    /**
+     * 操作记录
+     */
+    @TableField("operation_record")
+    private String operationRecord;
+
+    /**
+     * ip地址
+     */
+    @TableField("operation_ip")
+    private Integer operationIp;
+
+    /**
+     * 操作地址
+     */
+    @TableField("operation_address")
+    private String operationAddress;
+
+    /**
+     * 操作方法
+     */
+    @TableField("operation_method")
+    private String operationMethod;
+
+    /**
+     * 操作请求方式
+     */
+    @TableField("operation_way")
+    private String operationWay;
+
+    /**
+     * 操作url
+     */
+    @TableField("operation_url")
+    private String operationUrl;
+
+    /**
+     * 操作参数
+     */
+    @TableField("operation_param")
+    private String operationParam;
+
+    /**
+     * 返回参数
+     */
+    @TableField("json_result")
+    private String jsonResult;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

dblayer-mbg/src/main/resources/mapper/base/BaseLoginLogMapper.xml

@@ -5,6 +5,12 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.LoginLog">
         <id column="id" property="id"/>
+        <result column="login_id" property="loginId"/>
+        <result column="login_name" property="loginName"/>
+        <result column="login_date" property="loginDate"/>
+        <result column="login_ip" property="loginIp"/>
+        <result column="login_address" property="loginAddress"/>
+        <result column="login_browser" property="loginBrowser"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

dblayer-mbg/src/main/resources/mapper/base/BaseOperationLogMapper.xml

@@ -5,6 +5,17 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.OperationLog">
         <id column="id" property="id"/>
+        <result column="operation_id" property="operationId"/>
+        <result column="operation_name" property="operationName"/>
+        <result column="operation_date" property="operationDate"/>
+        <result column="operation_record" property="operationRecord"/>
+        <result column="operation_ip" property="operationIp"/>
+        <result column="operation_address" property="operationAddress"/>
+        <result column="operation_method" property="operationMethod"/>
+        <result column="operation_way" property="operationWay"/>
+        <result column="operation_url" property="operationUrl"/>
+        <result column="operation_param" property="operationParam"/>
+        <result column="json_result" property="jsonResult"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

security-center/src/main/java/com/lantone/security/aop/DictionaryAspect.java

@@ -19,8 +19,6 @@ public class DictionaryAspect {
     @Autowired
     private MessageSender messageSender;
 
-    @Pointcut("execution(public * com.lantone.security.web.UserManagementController.login(..))")
-    private DictionaryInfoFacade dictionaryInfoFacade;
     @Pointcut("execution(public * com.lantone.security.web.DictionaryManagementController.addDictionary(..))" +
             "||execution(public * com.lantone.security.web.DictionaryManagementController.updateDictionary(..))" +
             "||execution(public * com.lantone.security.web.DictionaryManagementController.deleteDictionary(..))")

security-center/src/main/java/com/lantone/security/aop/HospitalSetAspect.java

@@ -19,7 +19,6 @@ public class HospitalSetAspect {
     @Autowired
     private MessageSender messageSender;
 
-    @Pointcut("execution(public * com.lantone.security.web.UserManagementController.addUser(..))")
     @Pointcut("execution(public * com.lantone.security.web.HospitalSetManagementController.addHospitalSet(..))" +
             "||execution(public * com.lantone.security.web.HospitalSetManagementController.updateHospitalSet(..))" +
             "||execution(public * com.lantone.security.web.HospitalSetManagementController.deleteHospitalSet(..))")