fs-danaus
2022-04-29 9a0d3265227f056d10ee72a99f61365d58de52e8
src/com/yc/service/user/UserAccountServiceImpl.java
@@ -1,6 +1,7 @@
package com.yc.service.user;
import com.yc.action.grid.GridUtils;
import com.yc.entity.LoginUserEntity;
import com.yc.entity.Page;
import com.yc.entity.UserAccountEntity;
import com.yc.factory.FactoryBean;
@@ -118,7 +119,26 @@
   this.jdbcTemplate.update(LOGIN_LOG, userCode, userName, userIpAddress,sessionId);
    }
    @Override
   @Override
   public void loginLogV2(UserAccountEntity userAccount, LoginUserEntity entity, String sessionId) {
      String sql="set nocount on ; \n"
            + " declare @UserCode varchar(50),@UserName varchar(50), @Useripaddress varchar(50) , @SessionId varchar(80)  ,@UserLoginType varchar(50),@EquipmentModel varchar(400),@OSType varchar(400),@Manufacturer varchar(50),@UserAgent varchar(2000),@Longitude varchar(50),@Latitude varchar(50),@CountryName varchar(80),@ProvinceName varchar(80),@CityName varchar(80),@CountyName varchar(80),@dbid int,@SystemDescribe varchar(100),@LogonDomain varchar(200)\n"
            + " select  @UserCode = ? ,@UserName  =? , @Useripaddress  =?, @SessionId =? , \n" +
            "           @UserLoginType=?,@EquipmentModel=?,@OSType=?,@Manufacturer=?,@UserAgent=?,@Longitude=?,@Latitude=?,@CountryName=?,@ProvinceName=?,@CityName=?,@CountyName=?,@dbid=?,@SystemDescribe=?,@LogonDomain=?\n"
            + " if not exists(select 1 from _sysLoginLog a where a.sessionid = @SessionId ) \n"
            + " begin  \n"
            + "     insert into _sysLoginLog(UserGUID,userCode,userName,inTime,useripaddress,sessionid,UserLoginType,EquipmentModel,OSType,Manufacturer,UserAgent,Longitude,Latitude,CountryName,ProvinceName,CityName,CountyName,dbid,SystemDescribe,LogonDomain) \n"
            + "     values('.',@UserCode,@UserName" + ",getDate(),@useripaddress,@sessionid,@UserLoginType,@EquipmentModel,@OSType,@Manufacturer,@UserAgent,@Longitude,@Latitude,@CountryName,@ProvinceName,@CityName,@CountyName,@dbid,@SystemDescribe,@LogonDomain)  \n"
            + " end else  \n"
            + " begin  \n"
            + "     update a set inTime = getDate(),useripaddress=@Useripaddress,UserLoginType=@UserLoginType,EquipmentModel=@EquipmentModel,OSType=@OSType,Manufacturer=@Manufacturer,UserAgent=@UserAgent,Longitude=@Longitude,Latitude=@Latitude,CountryName=@CountryName,ProvinceName=@ProvinceName,CityName=@CityName,CountyName=@CountyName from  _sysLoginLog a where a.sessionid = @SessionId \n"
            + " end \n";
      this.jdbcTemplate.update(sql,userAccount.getUserCode(),userAccount.getUserName(), entity.getIp(),sessionId,
                              entity.getUserLoginType(),entity.getEquipmentModel(),entity.getOSType(),entity.getManufacturer(),
                              entity.getUserAgent(),entity.getLongitude(),entity.getLatitude(),entity.getCountryName(),entity.getProvinceName(),entity.getCityName(),entity.getCountyName(),entity.getDbid(),entity.getSystemDescribe(),entity.getLogonDomain());
   }
   @Override
    public Map<String, Map<String, Object>> getUserProfiles(String userCode) {
   SqlRowSet rs = this.jdbcTemplate.queryForRowSet(GET_USER_PROFILE, userCode,userCode);
   Map<String, Map<String, Object>> map = new HashMap<String, Map<String, Object>>();
@@ -282,7 +302,7 @@
         + " DefaultAcctCode,LogonType,IsEnableLoadCollection,WxDeptID,Tel, \n"
         + " Gender,EMail, \n"
         + " LangId,Currency,WxCcCode,ProfileIds, \n"
         + " AccessIds,OpenId,IsStopSystem , activeApp,DefaultBrand,cccodepermission,isModifyPriceWhenScanQrCode,UserCodePermission,\n"
         + " AccessIds,OpenId,IsStopSystem , activeApp,DefaultBrand,cccodepermission,isModifyPriceWhenScanQrCode,UserCodePermission,isModifyPriceWhenSalesOrder,isModifyPriceWhenPurchaseOrder,switchToPageWhenLogonApp,\n"
         + " case when ISNULL(inActive,0) = 1 then '当前用户【'+ISNULL(UserName,'') + '】已停用,请与管理员联系!' "
            +"   else case when isnull(CalPwdExpired,0) > 0 then '您的密码已过期【' "
            +"   + CAST(ISNULL(CalPwdExpired,0) as varchar)+'】天' "
@@ -523,6 +543,9 @@
      userAccountEntity.setCcCodePermission(map.get("cccodepermission") == null?"":(String)map.get("cccodepermission"));
      userAccountEntity.setUserCodePermission(map.get("UserCodePermission") == null?"":(String)map.get("UserCodePermission"));
      userAccountEntity.setIsModifyPriceWhenScanQrCode(map.get("isModifyPriceWhenScanQrCode") == null?0:(Integer)map.get("isModifyPriceWhenScanQrCode"));
      userAccountEntity.setIsModifyPriceWhenSalesOrder(map.get("isModifyPriceWhenSalesOrder") == null?0:(Integer)map.get("isModifyPriceWhenSalesOrder"));
      userAccountEntity.setIsModifyPriceWhenPurchaseOrder(map.get("isModifyPriceWhenPurchaseOrder") == null?0:(Integer)map.get("isModifyPriceWhenPurchaseOrder"));
      userAccountEntity.setSwitchToPageWhenLogonApp(map.get("switchToPageWhenLogonApp")==null?"HomePage":GridUtils.prossRowSetDataType_String(map,"switchToPageWhenLogonApp"));
      userAccountEntity.setLogonType(map.get("LogonType") == null?0:(Integer)map.get("LogonType"));
      userAccountEntity.setEnableLoadCollection(map.get("IsEnableLoadCollection") != null&&map.get("IsEnableLoadCollection").equals(1)?true:false);
      userAccountEntity.setWxDeptID(map.get("WxDeptID") == null?0:(Integer)map.get("WxDeptID"));