新增接口

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/NoticeController.java

@@ -2,6 +2,10 @@ package com.muchinfo.mtp3century.controller;
 
 import com.muchinfo.mtp3century.service.INoticeService;
 import com.muchinfo.mtp3century.utils.AjaxResult;
+import com.muchinfo.mtp3century.utils.CenturyDecryptUtil;
+import com.muchinfo.mtp3common.enumtype.Constants;
+import com.muchinfo.mtp3common.enumtype.MessageType;
+import com.muchinfo.mtp3common.utils.JsonUtils;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3pojos.entity.GzMemberinfo;
 import com.muchinfo.mtp3pojos.entity.Noticemsg;
@@ -11,6 +15,8 @@ import com.muchinfo.mtp3pojos.vo.notice.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,14 +30,22 @@ import javax.servlet.http.HttpServletRequest;
 @Api(value = "通知公告API", description = "通知公告管理")
 public class NoticeController {
 
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
     @Resource
     private INoticeService iNoticeService;
 
-    @ApiOperation("通知公告-->发布通知公告")
+    @ApiOperation("通知公告-->发布通知公告-->新增")
     @RequestMapping(method = RequestMethod.POST, value = "/noticemsgadd")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult noticemsgadd(@RequestBody NoticeMsgAddParam param, HttpServletRequest request) {
-        return iNoticeService.noticemsgadd(param, request);
+    private AjaxResult noticemsgadd(@RequestBody String param, HttpServletRequest request) {
+        try {
+            NoticeMsgAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), NoticeMsgAddParam.class);
+            return iNoticeService.noticemsgadd(addParam, request);
+        } catch (Exception e) {
+            log.error("发布通知公告新增，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("通知公告-->公告通知管理-->获取列表")

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/SystemRunController.java

@@ -0,0 +1,142 @@
+package com.muchinfo.mtp3century.controller;
+
+
+import com.muchinfo.mtp3century.service.ISystemRunService;
+import com.muchinfo.mtp3century.utils.AjaxResult;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Ipbacklist;
+import com.muchinfo.mtp3pojos.entity.Systemmanagerlog;
+import com.muchinfo.mtp3pojos.entity.WskhBlacklist;
+import com.muchinfo.mtp3pojos.vo.systemsetup.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/operation")
+@Api(value = "系统运行API", description = "系统运行管理")
+public class SystemRunController {
+
+    @Resource
+    private ISystemRunService iSystemSetUpService;
+
+    @ApiOperation("系统运行管理-->管理员操作日志-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryLog")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<SystemUserLogResult> query(SystemUserLogParam param, HttpServletRequest request) {
+        return iSystemSetUpService.queryByPage(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->管理员操作日志-->详情")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/view")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<Systemmanagerlog> view(Long id, HttpServletRequest request) {
+        return iSystemSetUpService.view(id, request);
+    }
+
+    @ApiOperation("系统运行管理-->登录异常流水查询-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryError")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<SystemLoginErrorResult> queryError(SystemLoginErrorParam param, HttpServletRequest request) {
+        return iSystemSetUpService.queryError(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->登录异常流水查询-->导出")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/export")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private AjaxResult export(SystemLoginErrorParam param, HttpServletRequest request) {
+        return iSystemSetUpService.export(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->系统服务运行日志-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/querymrsl")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<YmrslQueryResult> querymrsl(YmrslQueryParam param, HttpServletRequest request) {
+        return iSystemSetUpService.querymrsl(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->开户黑名单管理-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryBlackList")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<WskhBlacklist> queryBlackList(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iSystemSetUpService.queryBlackList(pageNum, pageSize, request);
+    }
+
+    @ApiOperation("系统运行管理-->开户黑名单管理-->新增/修改")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/dealBlackList")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult dealBlackList(@RequestBody BlackListAddParam param, HttpServletRequest request) {
+        return iSystemSetUpService.dealBlackList(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->开户黑名单管理-->删除")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/delBlackList")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult delBlackList(Long id, HttpServletRequest request) {
+        return iSystemSetUpService.delBlackList(id, request);
+    }
+
+    @ApiOperation("系统运行管理-->IP黑名单管理-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryIPList")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<Ipbacklist> queryIPList(String adress, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iSystemSetUpService.queryIPList(adress, pageNum, pageSize, request);
+    }
+
+    @ApiOperation("系统运行管理-->IP黑名单管理-->新增")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/addIPList")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult addIPList(@RequestBody IpListDelParam param, HttpServletRequest request) {
+        return iSystemSetUpService.addIPList(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->IP黑名单管理-->删除")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/delIPList")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult delIPList(IpListDelParam param, HttpServletRequest request) {
+        return iSystemSetUpService.delIPList(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->终端登录日志-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryloginlog")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<LoginLogQueryResult> queryloginlog(LoginLogQueryParam param, HttpServletRequest request) {
+        return iSystemSetUpService.queryloginlog(param, request);
+    }
+
+    @ApiOperation("系统运行管理-->终端登录日志-->详情")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/loginlogview")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<LoginLogQueryResult> loginlogview(LoginLogQueryParam param, HttpServletRequest request) {
+        return iSystemSetUpService.loginlogview(param, request);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/loginlogExport")
+    @ResponseBody
+    @ApiOperation("系统运行管理-->终端登录日志-->导出")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    public AjaxResult loginlogExport(LoginLogQueryParam param, HttpServletRequest request) {
+        return iSystemSetUpService.loginlogExport(param, request);
+    }
+}

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/SystemSetUpController.java

@@ -1,118 +1,12 @@
 package com.muchinfo.mtp3century.controller;
 
-
-import com.muchinfo.mtp3century.service.ISystemSetUpService;
-import com.muchinfo.mtp3century.utils.AjaxResult;
-import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3pojos.entity.Ipbacklist;
-import com.muchinfo.mtp3pojos.entity.Systemmanagerlog;
-import com.muchinfo.mtp3pojos.entity.WskhBlacklist;
-import com.muchinfo.mtp3pojos.vo.systemsetup.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
 @Controller
-@RequestMapping("/operation")
-@Api(value = "系统运行API", description = "系统运行管理")
+@RequestMapping("/setup")
+@Api(value = "基础数据API", description = "基础数据管理")
 public class SystemSetUpController {
 
-    @Resource
-    private ISystemSetUpService iSystemSetUpService;
-
-    @ApiOperation("系统运行管理-->管理员操作日志-->获取列表")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/queryLog")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    private PageResult<SystemUserLogResult> query(SystemUserLogParam param, HttpServletRequest request) {
-        return iSystemSetUpService.queryByPage(param, request);
-    }
-
-    @ApiOperation("系统运行管理-->管理员操作日志-->详情")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/view")
-    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult<Systemmanagerlog> view(Long id, HttpServletRequest request) {
-        return iSystemSetUpService.view(id, request);
-    }
-
-    @ApiOperation("系统运行管理-->登录异常流水查询-->获取列表")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/queryError")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    private PageResult<SystemLoginErrorResult> queryError(SystemLoginErrorParam param, HttpServletRequest request) {
-        return iSystemSetUpService.queryError(param, request);
-    }
-
-    @ApiOperation("系统运行管理-->登录异常流水查询-->导出")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/export")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    private AjaxResult export(SystemLoginErrorParam param, HttpServletRequest request) {
-        return iSystemSetUpService.export(param, request);
-    }
-
-    @ApiOperation("系统运行管理-->系统服务运行日志-->获取列表")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/querymrsl")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    private PageResult<YmrslQueryResult> querymrsl(YmrslQueryParam param, HttpServletRequest request) {
-        return iSystemSetUpService.querymrsl(param, request);
-    }
-
-    @ApiOperation("系统运行管理-->开户黑名单管理-->获取列表")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/queryBlackList")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    private PageResult<WskhBlacklist> queryBlackList(Integer pageNum, Integer pageSize, HttpServletRequest request) {
-        return iSystemSetUpService.queryBlackList(pageNum, pageSize, request);
-    }
-
-    @ApiOperation("系统运行管理-->开户黑名单管理-->新增/修改")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/dealBlackList")
-    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult dealBlackList(@RequestBody BlackListAddParam param, HttpServletRequest request) {
-        return iSystemSetUpService.dealBlackList(param, request);
-    }
-
-    @ApiOperation("系统运行管理-->开户黑名单管理-->删除")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/delBlackList")
-    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult delBlackList(Long id, HttpServletRequest request) {
-        return iSystemSetUpService.delBlackList(id, request);
-    }
-
-    @ApiOperation("系统运行管理-->IP黑名单管理-->获取列表")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/queryIPList")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    private PageResult<Ipbacklist> queryIPList(String adress, Integer pageNum, Integer pageSize, HttpServletRequest request) {
-        return iSystemSetUpService.queryIPList(adress, pageNum, pageSize, request);
-    }
-
-    @ApiOperation("系统运行管理-->IP黑名单管理-->新增")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/addIPList")
-    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult addIPList(@RequestBody IpListDelParam param, HttpServletRequest request) {
-        return iSystemSetUpService.addIPList(param, request);
-    }
-
-    @ApiOperation("系统运行管理-->IP黑名单管理-->删除")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/delIPList")
-    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult delIPList(IpListDelParam param, HttpServletRequest request) {
-        return iSystemSetUpService.delIPList(param, request);
-    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/INoticeService.java

@@ -9,9 +9,10 @@ import com.muchinfo.mtp3pojos.entity.SiteColumndetail;
 import com.muchinfo.mtp3pojos.vo.notice.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
 
 public interface INoticeService {
-    AjaxResult noticemsgadd(NoticeMsgAddParam param, HttpServletRequest request);
+    AjaxResult noticemsgadd(NoticeMsgAddParam param, HttpServletRequest request) throws ParseException;
 
     PageResult<NoticeMsgQueryResult> query(NoticeMsgQueryParam param, HttpServletRequest request);
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ISystemSetUpService.java → mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ISystemRunService.java

@@ -9,7 +9,7 @@ import com.muchinfo.mtp3pojos.vo.systemsetup.*;
 
 import javax.servlet.http.HttpServletRequest;
 
-public interface ISystemSetUpService {
+public interface ISystemRunService {
     PageResult<SystemUserLogResult> queryByPage(SystemUserLogParam param, HttpServletRequest request);
 
     PageResult<SystemLoginErrorResult> queryError(SystemLoginErrorParam param, HttpServletRequest request);
@@ -31,4 +31,10 @@ public interface ISystemSetUpService {
     AjaxResult addIPList(IpListDelParam param, HttpServletRequest request);
 
     AjaxResult delIPList(IpListDelParam param, HttpServletRequest request);
+
+    PageResult<LoginLogQueryResult> queryloginlog(LoginLogQueryParam param, HttpServletRequest request);
+
+    AjaxResult<LoginLogQueryResult> loginlogview(LoginLogQueryParam param, HttpServletRequest request);
+
+    AjaxResult loginlogExport(LoginLogQueryParam param, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/NoticeServiceImpl.java

@@ -69,12 +69,14 @@ public class NoticeServiceImpl implements INoticeService {
     private ISiteColumndetailMapper iSiteColumndetailMapper;
 
     @Override
-    public AjaxResult noticemsgadd(NoticeMsgAddParam param, HttpServletRequest request) {
+    public AjaxResult noticemsgadd(NoticeMsgAddParam param, HttpServletRequest request) throws ParseException {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         Noticemsg noticeMsg = new Noticemsg();
         BeanUtils.copyProperties(param, noticeMsg);
         noticeMsg.setCreatorid(systemmanager.getAutoid());
         noticeMsg.setCreatetime(new Date());
+        noticeMsg.setEndtime(DateTimeUtils.parseDate(param.getEndtime()));
+        noticeMsg.setScheduletime(DateTimeUtils.parseDate(param.getScheduletime()));
         noticeMsg.setPublisher(systemmanager.getAreauserid().toString());
         noticeMsg.setSentstatus(0);
         noticeMsg.setIsforcedisplay(0);

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SystemSetUpServiceImpl.java → mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SystemRunServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muchinfo.mtp3century.service.ICommonService;
-import com.muchinfo.mtp3century.service.ISystemSetUpService;
+import com.muchinfo.mtp3century.service.ISystemRunService;
 import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3common.enumtype.MessageType;
 import com.muchinfo.mtp3common.enumtype.SysConstants;
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 @Service
-public class SystemSetUpServiceImpl implements ISystemSetUpService {
+public class SystemRunServiceImpl implements ISystemRunService {
     private final Logger log = LoggerFactory.getLogger(this.getClass());
     @Resource
     private ISystemmanagerMapper iSystemmanagerMapper;
@@ -218,7 +218,7 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
     @Override
     public PageResult<Ipbacklist> queryIPList(String adress, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         IPage<Ipbacklist> page = new Page<>(pageNum, pageSize);
-        IPage<Ipbacklist> queryResultIPage = iIpbacklistMapper.selectPage(page, new QueryWrapper<Ipbacklist>().like("IP",adress));
+        IPage<Ipbacklist> queryResultIPage = iIpbacklistMapper.selectPage(page, new QueryWrapper<Ipbacklist>().like("IP", adress));
         PageResult<Ipbacklist> result = new PageResult<>();
         result.setCode(Constants.Success_Code_Design);
         result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
@@ -232,13 +232,13 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
 
     @Override
     public AjaxResult addIPList(IpListDelParam param, HttpServletRequest request) {
-        if(param.getIp() == null || param.getIp().trim().isEmpty()){
+        if (param.getIp() == null || param.getIp().trim().isEmpty()) {
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM029.getCode(), request.getHeader("Accept-Language"));
         }
         Ipbacklist ipbacklist = iIpbacklistMapper.selectOne(new QueryWrapper<Ipbacklist>()
                 .eq("ip", param.getIp())
                 .eq("iptype", param.getIptype()));
-        if(Objects.nonNull(ipbacklist)){
+        if (Objects.nonNull(ipbacklist)) {
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language"));
         }
         Ipbacklist ip = new Ipbacklist();
@@ -256,6 +256,47 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
+    @Override
+    public PageResult<LoginLogQueryResult> queryloginlog(LoginLogQueryParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (!Objects.equals(systemmanager.getReletype(), SysConstants.SYS_TYPE_MANAGE)) {
+            param.setMemberuserid(systemmanager.getAreauserid());
+        }
+        IPage<LoginLogQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<LoginLogQueryResult> queryResultIPage = iSystemmanagerMapper.queryloginlog(page, param);
+        PageResult<LoginLogQueryResult> result = new PageResult<>();
+        result.setCode(Constants.Success_Code_Design);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        result.setPages(queryResultIPage.getPages());
+        result.setCurrent(queryResultIPage.getCurrent());
+        result.setTotal(queryResultIPage.getTotal());
+        result.setPageSize(queryResultIPage.getSize());
+        result.setData(queryResultIPage.getRecords());
+        return result;
+    }
+
+    @Override
+    public AjaxResult<LoginLogQueryResult> loginlogview(LoginLogQueryParam param, HttpServletRequest request) {
+        List<LoginLogQueryResult> results = iSystemmanagerMapper.queryloginlog(param);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), results.get(0));
+    }
+
+    @Override
+    public AjaxResult loginlogExport(LoginLogQueryParam param, HttpServletRequest request) {
+        try {
+            String fileName = "终端登录日志_" + DateTimeUtils.getDateTime("yyyyMMdd");
+            List<LoginLogQueryResult> resultIPage = iSystemmanagerMapper.queryloginlog(param);
+            if (CollectionUtils.isEmpty(resultIPage)) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
+            }
+            ExportResult exportResult = ExportUtil.write(fileName, LoginLogQueryResult.class, resultIPage);
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
+        } catch (Exception e) {
+            log.error("终端登录日志导出失败，失败原因：" + Arrays.toString(e.getStackTrace()));
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
+        }
+    }
+
     private boolean checkOnlyOne(BlackListAddParam blacklist) {
         Long num = iWskhBlacklistMapper.selectCount(new QueryWrapper<WskhBlacklist>()
                 .eq("cardtype", blacklist.getCardtype())

mtp3-century/src/main/resources/logback-spring.xml

@@ -43,16 +43,16 @@
     </appender>
 
     <!-- 配置输出级别 -->
-    <root level="INFO">
+    <root level="DEBUG">
         <!-- 加入控制台输出 -->
-        <!-- <appender-ref ref="CONSOLE"/> -->
+         <appender-ref ref="CONSOLE"/>
         <!-- 加入APPLICATION输出 -->
         <appender-ref ref="APPLICATION"/>
     </root>
 
     <logger name="org.mybatis" level="DEBUG">
         <!-- 加入控制台输出 -->
-        <!-- <appender-ref ref="CONSOLE"/> -->
+         <appender-ref ref="CONSOLE"/>
         <!-- 加入APPLICATION输出 -->
         <appender-ref ref="APPLICATION"/>
     </logger>

mtp3-century/src/main/resources/mapper/NoticemsgMapper.xml

@@ -137,23 +137,23 @@
                 where c.columntype=100 and c.id !=3
             </when>
             <otherwise>
-                select t.*,s.columnname, gm.membername "srcname",sy.username as creatoruser,
+                select t.*,s.columnname, gm.membername "srcname",sy.username as creatoruser
                 from site_columndetail t
                 left join site_columnconfig s on t.columnid = s.id
                 left join gz_memberinfo gm on t.srcid = gm.memberid
                 left join systemmanager sy on t.creatorid = sy.autoid
                 <where>
-                    <if test="columnid != null">
-                        and t.columnid=#{columnid}
+                    <if test="vo.columnid != null">
+                        and t.columnid=#{vo.columnid}
                     </if>
-                    <if test="title != null and title != ''">
-                        and t.title like '%'||#{title}||'%'
+                    <if test="vo.title != null and vo.title != ''">
+                        and t.title like '%'||#{vo.title}||'%'
                     </if>
-                    <if test="status != null">
-                        and t.status=#{status}
+                    <if test="vo.status != null">
+                        and t.status=#{vo.status}
                     </if>
-                    <if test="isshow != null">
-                        and t.isshow=#{isshow}
+                    <if test="vo.isshow != null">
+                        and t.isshow=#{vo.isshow}
                     </if>
                 </where>
                 order by t.istop desc, t.publishdate desc

mtp3-century/src/main/resources/mapper/SystemmanagerMapper.xml

@@ -255,4 +255,60 @@
         </where>
         order by t.updatetime desc
     </select>
+    <select id="queryloginlog" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.LoginLogQueryResult">
+        select t.loginflowno "loginflowno",t.loginid "loginid",t.funcode "funcode",
+        t.clienttype "clienttype",t.softversion "softversion",t.operatetime "operatetime",
+        t.loginip "loginip",t.loginport "loginport",t.deviceid "deviceid",
+        t.environmentinfo "environmentinfo",t.operatetype "operatetype",t.remark "remark",
+        t.logintype "logintype",t.authid "authid",t.authtype "authtype",t.loginretcode "loginretcode",
+        la.loginid "logincode",ua.accountname "accountname",area.accountname "areaname",
+        mem.accountname "membername",
+        <choose>
+            <when test="vo.ishis == 1">
+                1 as ishis
+            </when>
+            <otherwise>
+                0 as ishis
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="vo.ishis == 1">
+                from his_userloginflow t
+            </when>
+            <otherwise>
+                from userloginflow t
+            </otherwise>
+        </choose>
+        left join loginaccount la on t.loginid=la.loginid
+        left join useraccount ua on la.userid=ua.userid
+        left join useraccount area on ua.parentuserid = area.userid
+        left join useraccount mem on ua.memberuserid = mem.userid
+        <where>
+            and t.clienttype != 1
+            <if test="vo.logincode != null and vo.logincode != ''">
+                <![CDATA[and la.loginid = #{vo.logincode}]]>
+            </if>
+            <if test="vo.accountname !=null and vo.accountname != '' ">
+                <![CDATA[and ua.accountname like '%'||#{vo.accountname,jdbcType=VARCHAR}||'%']]>
+            </if>
+            <if test="vo.operatetime != null and vo.operatetime != ''">
+                <![CDATA[and t.operatetime >= to_date(#{vo.operatetime}||' 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
+                and t.operatetime <= to_date(#{vo.operatetime}||' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')]]>
+            </if>
+            <if test="vo.loginid != null and vo.loginid != ''">
+                <![CDATA[and t.loginid = #{vo.loginid}]]>
+            </if>
+            <if test="vo.loginflowno != null and vo.loginflowno != ''">
+                <![CDATA[and t.loginflowno = #{vo.loginflowno}]]>
+            </if>
+            <if test="vo.memberuserid != null and vo.memberuserid != ''">
+                <![CDATA[and ua.userid in (
+            		select uo.userid
+					from useraccount uo
+					start with uo.parentuserid = #{vo.memberuserid}
+					connect by prior uo.userid =uo.parentuserid and uo.userid != #{vo.memberuserid})]]>
+            </if>
+        </where>
+        order by t.operatetime desc
+    </select>
 </mapper>

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISystemmanagerMapper.java

@@ -44,5 +44,9 @@ public interface ISystemmanagerMapper extends BaseMapper<Systemmanager> {
 
     IPage<UserAccountSelfsupportResult> queryselfsupport(IPage<UserAccountSelfsupportResult> page, @Param("vo") UserAccountSelfsupportParam param);
 
-    IPage<YmrslQueryResult> querymrsl(IPage<YmrslQueryResult> page,@Param("vo")  YmrslQueryParam param);
+    IPage<YmrslQueryResult> querymrsl(IPage<YmrslQueryResult> page, @Param("vo") YmrslQueryParam param);
+
+    IPage<LoginLogQueryResult> queryloginlog(IPage<LoginLogQueryResult> page, @Param("vo") LoginLogQueryParam param);
+
+    List<LoginLogQueryResult> queryloginlog( @Param("vo") LoginLogQueryParam param);
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/NoticeMsgQueryResult.java

@@ -37,6 +37,8 @@ public class NoticeMsgQueryResult {
     @ApiModelProperty(value = "接收人")
     private String recipient;
 
+    private Integer isforcedisplay;
+
     private Long autoid;
 
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/LoginLogQueryParam.java

@@ -0,0 +1,39 @@
+package com.muchinfo.mtp3pojos.vo.systemsetup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "LoginLogQueryParam对象", description = "终端登录日志")
+public class LoginLogQueryParam {
+
+    @ApiModelProperty(value = "登录账号")
+    private String logincode;
+
+    @ApiModelProperty(value = "客户名称")
+    private String accountname;
+
+    @ApiModelProperty(value = "历史查询时间")
+    private String operatetime;
+
+    private Integer ishis;
+
+    private Long memberuserid;
+
+    private Long loginflowno;
+
+    private Long loginid;
+
+    @ApiModelProperty(value = "* 页码 *")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "* 页大小 *")
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/LoginLogQueryResult.java

@@ -0,0 +1,91 @@
+package com.muchinfo.mtp3pojos.vo.systemsetup;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "LoginLogQueryResult对象", description = "终端登录日志响应")
+public class LoginLogQueryResult {
+
+    @ExcelProperty("登录账号")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "登录账号")
+    private Long logincode;
+
+    @ExcelProperty("客户名称")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "客户名称")
+    private String accountname;
+
+    @ExcelProperty("所属机构")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "所属机构")
+    private String areaname;
+
+    @ExcelProperty("所属会员")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "所属会员")
+    private String membername;
+
+    @ExcelProperty("登录IP")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "登录IP")
+    private String loginip;
+
+    @ExcelProperty("登录/登出")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "登录/登出")
+    private Integer funcode;
+
+    @ExcelProperty("时间")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "时间")
+    private Date operatetime;
+
+    @ExcelProperty("结果")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "结果")
+    private Integer loginretcode;
+
+    @ExcelProperty("操作类型")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "操作类型")
+    private Integer operatetype;
+
+    private Long loginflowno;
+
+    @ApiModelProperty(value = "软件版本")
+    private String softversion;
+
+    @ApiModelProperty(value = "客户端类型")
+    private Integer clienttype;
+
+    @ApiModelProperty(value = "登录设备信息")
+    private String deviceid;
+
+    @ApiModelProperty(value = "登录软件环境信息")
+    private String environmentinfo;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "登录类型")
+    private Integer logintype;
+
+    @ApiModelProperty(value = "三方认证ID")
+    private Long authid;
+
+    @ApiModelProperty(value = "三方认证类型")
+    private Integer authtype;
+}