Ver Fonte

新增通知公告管理接口以及系统运行管理接口

xie.kaifeng há 8 meses atrás
pai
commit
9bc54de3aa
51 ficheiros alterados com 3272 adições e 614 exclusões
  1. 4 0
      mtp3-century/pom.xml
  2. 191 0
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/NoticeController.java
  3. 73 8
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/SystemSetUpController.java
  4. 59 0
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/INoticeService.java
  5. 20 4
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ISystemSetUpService.java
  6. 637 0
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/NoticeServiceImpl.java
  7. 134 10
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SystemSetUpServiceImpl.java
  8. 165 0
      mtp3-century/src/main/resources/mapper/NoticemsgMapper.xml
  9. 13 0
      mtp3-century/src/main/resources/mapper/SystemmanagerMapper.xml
  10. 9 3
      mtp3-century/src/main/resources/message_en.properties
  11. 151 145
      mtp3-century/src/main/resources/message_th.properties
  12. 151 145
      mtp3-century/src/main/resources/message_zh-cn.properties
  13. 151 145
      mtp3-century/src/main/resources/message_zh-hk.properties
  14. 151 145
      mtp3-century/src/main/resources/message_zh-tw.properties
  15. 6 0
      mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/MessageType.java
  16. 16 0
      mtp3-common/src/main/java/com/muchinfo/mtp3common/utils/CommonUtil.java
  17. 16 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IGzMemberinfoMapper.java
  18. 16 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IMemberrecvMapper.java
  19. 16 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IMsgreceiverMapper.java
  20. 28 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/INoticemsgMapper.java
  21. 17 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISiteColumnconfigMapper.java
  22. 16 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISiteColumndetailMapper.java
  23. 16 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISmscollectionMapper.java
  24. 16 0
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISmsparametersMapper.java
  25. 3 4
      mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISystemmanagerMapper.java
  26. 74 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/GzMemberinfo.java
  27. 47 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Memberrecv.java
  28. 60 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Msgreceiver.java
  29. 118 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Noticemsg.java
  30. 79 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/SiteColumnconfig.java
  31. 123 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/SiteColumndetail.java
  32. 87 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Smscollection.java
  33. 50 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Smsparameters.java
  34. 3 5
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/WskhBlacklist.java
  35. 27 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnAddParam.java
  36. 29 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnQueryParam.java
  37. 37 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnQueryResult.java
  38. 27 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnSourceAddParam.java
  39. 27 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnSourceQueryResult.java
  40. 34 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/InforManQueryParam.java
  41. 50 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/InforManQueryResult.java
  42. 26 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/InformManinitMessage.java
  43. 42 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/NoticeMsgAddParam.java
  44. 40 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/NoticeMsgQueryParam.java
  45. 42 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/NoticeMsgQueryResult.java
  46. 33 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/SmsQueryParam.java
  47. 37 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/SmsQueryResult.java
  48. 24 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/BlackListAddParam.java
  49. 22 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/IpListDelParam.java
  50. 28 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/YmrslQueryParam.java
  51. 31 0
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/YmrslQueryResult.java

+ 4 - 0
mtp3-century/pom.xml

@@ -133,6 +133,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -0,0 +1,191 @@
+package com.muchinfo.mtp3century.controller;
+
+import com.muchinfo.mtp3century.service.INoticeService;
+import com.muchinfo.mtp3century.utils.AjaxResult;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.GzMemberinfo;
+import com.muchinfo.mtp3pojos.entity.Noticemsg;
+import com.muchinfo.mtp3pojos.entity.SiteColumnconfig;
+import com.muchinfo.mtp3pojos.entity.SiteColumndetail;
+import com.muchinfo.mtp3pojos.vo.notice.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+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.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/notice")
+@Api(value = "通知公告API", description = "通知公告管理")
+public class NoticeController {
+
+    @Resource
+    private INoticeService iNoticeService;
+
+    @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);
+    }
+
+    @ApiOperation("通知公告-->公告通知管理-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/query")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<NoticeMsgQueryResult> query(NoticeMsgQueryParam param, HttpServletRequest request) {
+        return iNoticeService.query(param, request);
+    }
+
+    @ApiOperation("通知公告-->公告通知管理-->详情")
+    @RequestMapping(method = RequestMethod.GET, value = "/noticeMsgDetail")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<Noticemsg> noticeMsgDetail(Long auditid, HttpServletRequest request) {
+        return iNoticeService.noticeMsgDetail(auditid, request);
+    }
+
+    @ApiOperation("通知公告-->公告通知管理-->删除")
+    @RequestMapping(method = RequestMethod.GET, value = "/delete")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult delete(Long auditid, HttpServletRequest request) {
+        return iNoticeService.delete(auditid, request);
+    }
+
+    @ApiOperation("通知公告-->公告通知管理-->强制弹出/取消强制弹出")
+    @RequestMapping(method = RequestMethod.GET, value = "/updateforcedisplay")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult updateforcedisplay(Long auditid, Integer isforcedisplay, HttpServletRequest request) {
+        return iNoticeService.updateforcedisplay(auditid, isforcedisplay, request);
+    }
+
+    @ApiOperation("通知公告-->公告通知管理-->审核")
+    @RequestMapping(method = RequestMethod.GET, value = "/auditMsg")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult auditMsg(Long auditid, Integer auditflag, String msg, HttpServletRequest request) {
+        return iNoticeService.auditMsg(auditid, auditflag, msg, request);
+    }
+
+    @ApiOperation("通知公告-->短信查询-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/smsquery")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<SmsQueryResult> smsquery(SmsQueryParam param, HttpServletRequest request) {
+        return iNoticeService.smsquery(param, request);
+    }
+
+    @ApiOperation("通知公告-->短信查询-->重新发送")
+    @RequestMapping(method = RequestMethod.GET, value = "/resend")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult resend(Long msgid, HttpServletRequest request) {
+        return iNoticeService.resend(msgid, request);
+    }
+
+    @ApiOperation("通知公告-->资讯栏目-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/columnquery")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<ColumnQueryResult> columnquery(ColumnQueryParam param, HttpServletRequest request) {
+        return iNoticeService.columnquery(param, request);
+    }
+
+    @ApiOperation("通知公告-->资讯栏目-->新增/修改")
+    @RequestMapping(method = RequestMethod.POST, value = "/dealcolumn")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult dealcolumn(@RequestBody ColumnAddParam param, HttpServletRequest request) {
+        return iNoticeService.dealcolumn(param, request);
+    }
+
+    @ApiOperation("通知公告-->资讯栏目-->详情")
+    @RequestMapping(method = RequestMethod.GET, value = "/columnDetail")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<SiteColumnconfig> columnDetail(Long id, HttpServletRequest request) {
+        return iNoticeService.columnDetail(id, request);
+    }
+
+    @ApiOperation("通知公告-->资讯栏目-->删除")
+    @RequestMapping(method = RequestMethod.GET, value = "/columndelete")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult columndelete(Long id, HttpServletRequest request) {
+        return iNoticeService.columndelete(id, request);
+    }
+
+    @ApiOperation("通知公告-->资讯来源-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/columnsourcequery")
+
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<ColumnSourceQueryResult> columnsourcequery(String smembername, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iNoticeService.columnsourcequery(smembername, pageNum, pageSize, request);
+    }
+
+    @ApiOperation("通知公告-->资讯来源-->新增/修改")
+    @RequestMapping(method = RequestMethod.POST, value = "/dealcolumnsource")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult dealcolumnsource(@RequestBody ColumnSourceAddParam param, HttpServletRequest request) {
+        return iNoticeService.dealcolumnsource(param, request);
+    }
+
+    @ApiOperation("通知公告-->资讯来源-->删除")
+    @RequestMapping(method = RequestMethod.GET, value = "/columnsourcedelete")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult columnsourcedelete(Long memberid, HttpServletRequest request) {
+        return iNoticeService.columnsourcedelete(memberid, request);
+    }
+
+    @ApiOperation("通知公告-->资讯栏目-->详情")
+    @RequestMapping(method = RequestMethod.GET, value = "/columnsourceDetail")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<GzMemberinfo> columnsourceDetail(Long memberid, HttpServletRequest request) {
+        return iNoticeService.columnsourceDetail(memberid, request);
+    }
+
+    @ApiOperation("通知公告-->资讯管理-->初始化类型列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/informManinit")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<InformManinitMessage> informManinit(HttpServletRequest request) {
+        return iNoticeService.informManinit(request);
+    }
+
+    @ApiOperation("通知公告-->资讯管理-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/informManquery")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<InforManQueryResult> informManquery(InforManQueryParam param, HttpServletRequest request) {
+        return iNoticeService.informManquery(param, request);
+    }
+
+    @ApiOperation("通知公告-->资讯管理-->详情")
+    @RequestMapping(method = RequestMethod.GET, value = "/informDetail")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<SiteColumndetail> informDetail(Long id, HttpServletRequest request) {
+        return iNoticeService.informDetail(id, request);
+    }
+
+    @ApiOperation("通知公告-->资讯管理-->展示/不展示")
+    @RequestMapping(method = RequestMethod.GET, value = "/isshow")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult isshow(Long id, HttpServletRequest request) {
+        return iNoticeService.isshow(id, request);
+    }
+
+    @ApiOperation("通知公告-->资讯管理-->新增/修改")
+    @RequestMapping(method = RequestMethod.POST, value = "/dealinform")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult dealinform(@RequestBody SiteColumndetail param, HttpServletRequest request) {
+        return iNoticeService.dealinform(param, request);
+    }
+
+    @ApiOperation("通知公告-->资讯管理-->审核")
+    @RequestMapping(method = RequestMethod.GET, value = "/auditinform")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult auditinform(Long id, Integer flag, HttpServletRequest request) {
+        return iNoticeService.auditinform(id, flag, request);
+    }
+
+    @ApiOperation("通知公告-->资讯管理-->删除")
+    @RequestMapping(method = RequestMethod.GET, value = "/deleteinform")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult deleteinform(Long id, HttpServletRequest request) {
+        return iNoticeService.deleteinform(id, request);
+    }
+}

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

@@ -4,14 +4,15 @@ 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.vo.systemsetup.SystemLoginErrorParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorResult;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogResult;
+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;
@@ -21,13 +22,13 @@ import javax.servlet.http.HttpServletRequest;
 
 @Controller
 @RequestMapping("/operation")
-@Api(value = "系统运行API", description = "系统设置管理")
+@Api(value = "系统运行API", description = "系统运行管理")
 public class SystemSetUpController {
 
     @Resource
     private ISystemSetUpService iSystemSetUpService;
 
-    @ApiOperation("系统设置管理-->系统运行管理-->管理员操作日志-->获取列表")
+    @ApiOperation("系统运行管理-->管理员操作日志-->获取列表")
     @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryLog")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
@@ -35,7 +36,15 @@ public class SystemSetUpController {
         return iSystemSetUpService.queryByPage(param, request);
     }
 
-    @ApiOperation("系统设置管理-->系统运行管理-->登录异常流水查询-->获取列表")
+    @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)
@@ -43,11 +52,67 @@ public class SystemSetUpController {
         return iSystemSetUpService.queryError(param, request);
     }
 
-    @ApiOperation("系统设置管理-->系统运行管理-->登录异常流水查询-->导出")
+    @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);
+    }
 }

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

@@ -0,0 +1,59 @@
+package com.muchinfo.mtp3century.service;
+
+import com.muchinfo.mtp3century.utils.AjaxResult;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.GzMemberinfo;
+import com.muchinfo.mtp3pojos.entity.Noticemsg;
+import com.muchinfo.mtp3pojos.entity.SiteColumnconfig;
+import com.muchinfo.mtp3pojos.entity.SiteColumndetail;
+import com.muchinfo.mtp3pojos.vo.notice.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface INoticeService {
+    AjaxResult noticemsgadd(NoticeMsgAddParam param, HttpServletRequest request);
+
+    PageResult<NoticeMsgQueryResult> query(NoticeMsgQueryParam param, HttpServletRequest request);
+
+    AjaxResult<Noticemsg> noticeMsgDetail(Long msgId, HttpServletRequest request);
+
+    AjaxResult delete(Long msgId, HttpServletRequest request);
+
+    AjaxResult updateforcedisplay(Long msgId, Integer isforcedisplay, HttpServletRequest request);
+
+    AjaxResult auditMsg(Long auditid, Integer auditflag, String msg, HttpServletRequest request);
+
+    PageResult<SmsQueryResult> smsquery(SmsQueryParam param, HttpServletRequest request);
+
+    AjaxResult resend(Long msgid, HttpServletRequest request);
+
+    PageResult<ColumnQueryResult> columnquery(ColumnQueryParam param, HttpServletRequest request);
+
+    AjaxResult dealcolumn(ColumnAddParam param, HttpServletRequest request);
+
+    AjaxResult<SiteColumnconfig> columnDetail(Long id, HttpServletRequest request);
+
+    AjaxResult columndelete(Long id, HttpServletRequest request);
+
+    PageResult<ColumnSourceQueryResult> columnsourcequery(String smembername, Integer pageNum, Integer pageSize, HttpServletRequest request);
+
+    AjaxResult dealcolumnsource(ColumnSourceAddParam param, HttpServletRequest request);
+
+    AjaxResult columnsourcedelete(Long memberid, HttpServletRequest request);
+
+    AjaxResult<GzMemberinfo> columnsourceDetail(Long memberid, HttpServletRequest request);
+
+    PageResult<InforManQueryResult> informManquery(InforManQueryParam param, HttpServletRequest request);
+
+    AjaxResult<InformManinitMessage> informManinit(HttpServletRequest request);
+
+    AjaxResult<SiteColumndetail> informDetail(Long id, HttpServletRequest request);
+
+    AjaxResult isshow(Long id, HttpServletRequest request);
+
+    AjaxResult dealinform(SiteColumndetail param, HttpServletRequest request);
+
+    AjaxResult auditinform(Long id, Integer flag, HttpServletRequest request);
+
+    AjaxResult deleteinform(Long id, HttpServletRequest request);
+}

+ 20 - 4
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ISystemSetUpService.java

@@ -2,10 +2,10 @@ package com.muchinfo.mtp3century.service;
 
 import com.muchinfo.mtp3century.utils.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorResult;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogResult;
+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 javax.servlet.http.HttpServletRequest;
 
@@ -15,4 +15,20 @@ public interface ISystemSetUpService {
     PageResult<SystemLoginErrorResult> queryError(SystemLoginErrorParam param, HttpServletRequest request);
 
     AjaxResult export(SystemLoginErrorParam param, HttpServletRequest request);
+
+    PageResult<YmrslQueryResult> querymrsl(YmrslQueryParam param, HttpServletRequest request);
+
+    AjaxResult<Systemmanagerlog> view(Long id, HttpServletRequest request);
+
+    PageResult<WskhBlacklist> queryBlackList(Integer pageNum, Integer pageSize, HttpServletRequest request);
+
+    AjaxResult dealBlackList(BlackListAddParam param, HttpServletRequest request);
+
+    AjaxResult delBlackList(Long id, HttpServletRequest request);
+
+    PageResult<Ipbacklist> queryIPList(String adress, Integer pageNum, Integer pageSize, HttpServletRequest request);
+
+    AjaxResult addIPList(IpListDelParam param, HttpServletRequest request);
+
+    AjaxResult delIPList(IpListDelParam param, HttpServletRequest request);
 }

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

@@ -0,0 +1,637 @@
+package com.muchinfo.mtp3century.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.mtp.proto.Common;
+import com.muchinfo.mtp.proto.ShortMessageMtp1;
+import com.muchinfo.mtp3century.service.ICommonService;
+import com.muchinfo.mtp3century.service.INoticeService;
+import com.muchinfo.mtp3century.utils.AjaxResult;
+import com.muchinfo.mtp3common.enumtype.*;
+import com.muchinfo.mtp3common.utils.CommonUtil;
+import com.muchinfo.mtp3common.utils.EncryptionUtils;
+import com.muchinfo.mtp3common.utils.SerialNumberUtils;
+import com.muchinfo.mtp3common.utils.DateTimeUtils;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3common.vo.ProtoHelper;
+import com.muchinfo.mtp3interface.mapper.*;
+import com.muchinfo.mtp3pojos.entity.*;
+import com.muchinfo.mtp3pojos.vo.notice.*;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageProperties;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class NoticeServiceImpl implements INoticeService {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+    @Resource
+    private ICommonService iCommonService;
+    @Resource
+    private ISystemmanagerMapper iSystemmanagerMapper;
+    @Resource
+    private INoticemsgMapper iNoticemsgMapper;
+    @Resource
+    private IMsgreceiverMapper iMsgreceiverMapper;
+    @Resource
+    private IMemberrecvMapper iMemberrecvMapper;
+    @Resource
+    private IUseraccountMapper iUseraccountMapper;
+    @Resource
+    private SystemmanagerServiceImpl systemmanagerService;
+    @Resource
+    private ISmscollectionMapper iSmscollectionMapper;
+    @Resource
+    private ISmsparametersMapper iSmsparametersMapper;
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+    @Resource
+    private ISiteColumnconfigMapper iSiteColumnconfigMapper;
+    @Resource
+    private IGzMemberinfoMapper iGzMemberinfoMapper;
+    @Resource
+    private ISiteColumndetailMapper iSiteColumndetailMapper;
+
+    @Override
+    public AjaxResult noticemsgadd(NoticeMsgAddParam param, HttpServletRequest request) {
+        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.setPublisher(systemmanager.getAreauserid().toString());
+        noticeMsg.setSentstatus(0);
+        noticeMsg.setIsforcedisplay(0);
+
+        /*
+         * 1:全体广播
+         * 如果是平台管理员发布的, 所有的投资者和管理员都能接收到消息,
+         * 如果是会员管理员发的全体广播,改会员下的投资者和管理员能接收消息。
+         * 2:按会员广播
+         * 只有平台管理员才有此选项,选中会员管理员及下属投资者都可以接收消息
+         * 3:按个人推送
+         * 只推送给投资者
+         * 4:按会员广播(仅会员)
+         * 只有平台管理员才有此选项,只有选中会员管理员都可以接收消息(不包括其下属投资者)
+         */
+        if (SysEnums.SendTypeEnum.ALLSEND.getCode().equals(param.getSendtype())) {
+            saveSendAll(noticeMsg);
+        } else if (SysEnums.SendTypeEnum.MEMBERSEND.getCode().equals(param.getSendtype())) {
+            String[] split = param.getMemberidlist().split(",");
+
+            if (split.length > 0) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_NOTICE_ERROR_CODE_01.getCode(), request.getHeader("Accept-Language"));
+            }
+            saveSendMember(noticeMsg, split);
+        } else if (SysEnums.SendTypeEnum.PERSONSEND.getCode().equals(param.getSendtype())) {
+            //3:当推送方式个人推送   消息接受者只有投资者  消息为一条
+            noticeMsg.setUserid(param.getInvertorID());
+            iNoticemsgMapper.insert(noticeMsg);
+        } else if (SysEnums.SendTypeEnum.ONLYMEMBERSEND.getCode().equals(param.getSendtype())) {
+            String[] split = param.getMemberidlist().split(",");
+
+            if (split.length > 0) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_NOTICE_ERROR_CODE_01.getCode(), request.getHeader("Accept-Language"));
+            }
+            saveSendOnlyMember(noticeMsg, split);
+        } else if (SysEnums.SendTypeEnum.ALLUSER.getCode().equals(param.getSendtype())) {
+            saveSendAllUser(noticeMsg);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<NoticeMsgQueryResult> query(NoticeMsgQueryParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        //平台登陆  查所有
+        if (systemmanager.getAreauserid() != 0) {
+            if (StringUtils.isNotEmpty(param.getPublisher())) {
+                param.setPublisher(systemmanager.getAreauserid().toString());
+            }
+        }
+        PageResult<NoticeMsgQueryResult> pageResult = new PageResult<>();
+        IPage<NoticeMsgQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<NoticeMsgQueryResult> resultIPage = iNoticemsgMapper.query(page, param);
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultIPage.getPages());
+        pageResult.setCurrent(resultIPage.getCurrent());
+        pageResult.setTotal(resultIPage.getTotal());
+        pageResult.setPageSize(resultIPage.getSize());
+        pageResult.setData(resultIPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult<Noticemsg> noticeMsgDetail(Long msgId, HttpServletRequest request) {
+
+        Noticemsg noticeMsg = iNoticemsgMapper.selectOne(new QueryWrapper<Noticemsg>().eq("autoid", msgId));
+
+        Integer sendType = noticeMsg.getSendtype();
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", noticeMsg.getCreatorid()));
+        if (user != null) {
+            noticeMsg.setCreatorName(user.getUsername());
+        }
+        if (noticeMsg.getAuditoruserid() != null) {
+            user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", noticeMsg.getAuditoruserid()));
+            if (user != null) {
+                noticeMsg.setAuditName(user.getUsername());
+            }
+        }
+        //按会员发送
+        if (SysEnums.SendTypeEnum.MEMBERSEND.getCode().equals(sendType)) {
+            List<Memberrecv> userRecvs = iMemberrecvMapper.selectList(new QueryWrapper<Memberrecv>().eq("msgid", msgId));
+            StringBuilder name = new StringBuilder();
+            for (Memberrecv userRecv : userRecvs) {
+                Useraccount organization = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", userRecv.getMemberid()));
+                if (organization == null) {
+                    return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_NOTICE_ERROR_CODE_02.getCode(), request.getHeader("Accept-Language"));
+                }
+                name.append(organization.getAccountname()).append(",");
+            }
+            name = new StringBuilder(name.substring(0, name.length() - 1));
+            noticeMsg.setMembername(name.toString());
+        } else if (SysEnums.SendTypeEnum.PERSONSEND.getCode().equals(sendType)) {
+            noticeMsg.setMembername(iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", noticeMsg.getUserid())).getAccountname());
+        } else if (SysEnums.SendTypeEnum.ONLYMEMBERSEND.getCode().equals(sendType)) {
+            //4当推送方式为按会员广播(仅会员)
+            List<Msgreceiver> managerRecvs = iMsgreceiverMapper.selectList(new QueryWrapper<Msgreceiver>().eq("autoid", msgId));
+            StringBuilder name = new StringBuilder();
+            for (Msgreceiver managerRecv : managerRecvs) {
+                Systemmanager systemManager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", managerRecv.getManagerid()));
+                Useraccount organization = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", systemManager.getAreauserid()));
+                if (organization == null) {
+                    return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_NOTICE_ERROR_CODE_02.getCode(), request.getHeader("Accept-Language"));
+                }
+                name.append(organization.getAccountname()).append(",");
+            }
+            name = new StringBuilder(name.substring(0, name.length() - 1));
+            noticeMsg.setMembername(name.toString());
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), noticeMsg);
+    }
+
+    @Override
+    public AjaxResult delete(Long autoid, HttpServletRequest request) {
+        iMemberrecvMapper.delete(new QueryWrapper<Memberrecv>().eq("msgid", autoid));
+        iMsgreceiverMapper.delete(new QueryWrapper<Msgreceiver>().eq("autoid", autoid));
+        iNoticemsgMapper.delete(new QueryWrapper<Noticemsg>().eq("autoid", autoid));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult updateforcedisplay(Long msgId, Integer isforcedisplay, HttpServletRequest request) {
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Noticemsg msg = iNoticemsgMapper.selectOne(new QueryWrapper<Noticemsg>().eq("autoid", msgId));
+        if (msg != null) {
+            int oldValue = msg.getIsforcedisplay() == null ? 0 : msg.getIsforcedisplay();
+            msg.setIsforcedisplay(isforcedisplay);
+
+            iNoticemsgMapper.updateById(msg);
+
+            //写操作日志
+            systemmanagerService.writeOperateLog(SysConstants.NOTICEMSG_MANAGE, "设置/取消公告消息强制弹出:" + msg.getAutoid().toString(), user, "公告标题【" + msg.getTitle() + "】", Integer.toString(oldValue), isforcedisplay.toString());
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult auditMsg(Long auditid, Integer auditflag, String msg, HttpServletRequest request) {
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Noticemsg noticeMsg = iNoticemsgMapper.selectOne(new QueryWrapper<Noticemsg>().eq("autoid", auditid));
+        if (noticeMsg != null) {
+            if (noticeMsg.getSentstatus() == 0) {
+                if (auditflag == 1) {
+                    noticeMsg.setSentstatus(1);
+                } else {
+                    noticeMsg.setSentstatus(2);
+                }
+                noticeMsg.setAudittime(new Date());
+                noticeMsg.setAuditoruserid(user.getAutoid());
+                if (msg != null) {
+                    noticeMsg.setAuditremark(msg);
+                }
+                iNoticemsgMapper.updateById(noticeMsg);
+            }
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<SmsQueryResult> smsquery(SmsQueryParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        //平台登录  查所有
+        //经纪会员登录,要根据手机号码查投资者并且投资者所属当前登录经纪会员
+        if (systemmanager.getAreauserid() != 1) {
+            if (param.getUserid() == null) {
+                param.setUserid(systemmanager.getAreauserid());
+            }
+        }
+        if (StringUtils.isNotBlank(param.getRecvphone())) {
+            // 有手机号时,加密后查询
+            param.setRecvphone(EncryptionUtils.encryptByAES(param.getRecvphone()));
+        }
+        PageResult<SmsQueryResult> pageResult = new PageResult<>();
+        IPage<SmsQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<SmsQueryResult> resultIPage = iNoticemsgMapper.smsquery(page, param);
+        resultIPage.getRecords().forEach(a -> {
+            if (!param.getSensitive().contains("2")) {
+                a.setRecvphone(CommonUtil.unViewMobile(EncryptionUtils.decryptForAES(a.getRecvphone())));
+                a.setFailedphone(CommonUtil.unViewMobile(EncryptionUtils.decryptForAES(a.getFailedphone())));
+
+            } else {
+                a.setRecvphone(EncryptionUtils.decryptForAES(a.getRecvphone()));
+                a.setFailedphone(EncryptionUtils.decryptForAES(a.getFailedphone()));
+            }
+        });
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultIPage.getPages());
+        pageResult.setCurrent(resultIPage.getCurrent());
+        pageResult.setTotal(resultIPage.getTotal());
+        pageResult.setPageSize(resultIPage.getSize());
+        pageResult.setData(resultIPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult resend(Long msgid, HttpServletRequest request) {
+        Smscollection con = iSmscollectionMapper.selectOne(new QueryWrapper<Smscollection>().eq("msgid", msgid));
+        List<Smsparameters> params = iSmsparametersMapper.selectList(new QueryWrapper<Smsparameters>().eq("msgid", msgid));
+
+        ShortMessageMtp1.ShortMsgSendReq.Builder smsbuilder = ShortMessageMtp1.ShortMsgSendReq.newBuilder();
+        smsbuilder.setMsgType(2);
+        smsbuilder.setPriority(2);
+        smsbuilder.setScheduledTime("");
+        smsbuilder.addRecvPhone(EncryptionUtils.decryptForAES(con.getRecvphone()));
+        smsbuilder.setTemplateID(con.getTemplid().intValue());
+
+        params.sort((Smsparameters o1, Smsparameters o2) ->
+                o1.getOffset().compareTo(o2.getOffset()));
+
+        params.forEach(p -> {
+            smsbuilder.addParamValues(p.getParam());
+        });
+
+        Long uuid = SerialNumberUtils.getNewSerialNumberByFuncode(FunCodeConstants.FunCode_Trade_ShortMsgSendRsp);
+        // 添加消息头
+        Common.MessageHead.Builder headBuil = Common.MessageHead.newBuilder();
+        headBuil.setFunCode(FunCodeConstants.FunCode_Trade_ShortMsgSendReq);
+        headBuil.setUUID(uuid.toString());
+        smsbuilder.setHeader(headBuil.build());
+        byte[] body = ProtoHelper.getNTAS(smsbuilder.build().toByteArray(),
+                FunCodeConstants.FunCode_Trade_ShortMsgSendReq);
+        MessageProperties msgProperties = new MessageProperties();
+        msgProperties.setHeader("messageType", "protoBuf");
+        rabbitTemplate.send(SysConstants.RabbitShortMessage, new Message(body, msgProperties));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<ColumnQueryResult> columnquery(ColumnQueryParam param, HttpServletRequest request) {
+        PageResult<ColumnQueryResult> pageResult = new PageResult<>();
+        IPage<ColumnQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<ColumnQueryResult> resultIPage = iNoticemsgMapper.columnquery(page, param);
+        resultIPage.getRecords().forEach(a -> {
+            a.setCreatoruser(iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", a.getCreatorid())).getUsername());
+        });
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultIPage.getPages());
+        pageResult.setCurrent(resultIPage.getCurrent());
+        pageResult.setTotal(resultIPage.getTotal());
+        pageResult.setPageSize(resultIPage.getSize());
+        pageResult.setData(resultIPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult dealcolumn(ColumnAddParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (param.getId() != null) {
+            SiteColumnconfig temp = iSiteColumnconfigMapper.selectOne(new QueryWrapper<SiteColumnconfig>().eq("id", param.getId()));
+            temp.setColumnname(param.getColumnname());
+            temp.setColumntype(param.getColumntype());
+            temp.setIsshow(param.getIsshow());
+            temp.setSort(param.getSort());
+            temp.setUpdatedate(new Date());
+            temp.setModifierid(systemmanager.getAutoid());
+            iSiteColumnconfigMapper.updateById(temp);
+        } else {
+            SiteColumnconfig config = new SiteColumnconfig();
+            config.setColumnname(param.getColumnname());
+            config.setColumntype(param.getColumntype());
+            config.setIsshow(param.getIsshow());
+            config.setSort(param.getSort());
+            config.setCreaedate(new Date());
+            config.setUpdatedate(new Date());
+            config.setCreatorid(systemmanager.getAutoid());
+            config.setModifierid(systemmanager.getAutoid());
+            iSiteColumnconfigMapper.insert(config);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult<SiteColumnconfig> columnDetail(Long id, HttpServletRequest request) {
+        SiteColumnconfig temp = iSiteColumnconfigMapper.selectOne(new QueryWrapper<SiteColumnconfig>().eq("id", id));
+        temp.setModifieruser(iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", temp.getModifierid())).getUsername());
+        temp.setCreatoruser(iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", temp.getCreatorid())).getUsername());
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), temp);
+    }
+
+    @Override
+    public AjaxResult columndelete(Long id, HttpServletRequest request) {
+        iSiteColumnconfigMapper.delete(new QueryWrapper<SiteColumnconfig>().eq("id", id));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<ColumnSourceQueryResult> columnsourcequery(String smembername, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        PageResult<ColumnSourceQueryResult> pageResult = new PageResult<>();
+        IPage<ColumnSourceQueryResult> page = new Page<>(pageNum, pageSize);
+        IPage<ColumnSourceQueryResult> resultIPage = iNoticemsgMapper.columnsourcequery(page, smembername);
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultIPage.getPages());
+        pageResult.setCurrent(resultIPage.getCurrent());
+        pageResult.setTotal(resultIPage.getTotal());
+        pageResult.setPageSize(resultIPage.getSize());
+        pageResult.setData(resultIPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult dealcolumnsource(ColumnSourceAddParam param, HttpServletRequest request) {
+        if (param.getMemberid() == null) {
+            GzMemberinfo entity = new GzMemberinfo();
+            entity.setMemberid(param.getMemberid());
+            entity.setMembername(param.getMembername());
+            String tags = param.getMembertags();
+            if (tags == null) {
+                entity.setMembertags("");
+            } else {
+                //替换中文逗号为英文逗号
+                entity.setMembertags(tags.replace(",", ","));
+            }
+            entity.setImageurl(param.getImageurl());
+            entity.setUpdatetime(new Date());
+
+            iGzMemberinfoMapper.insert(entity);
+        } else {
+            GzMemberinfo entity = iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", param.getMemberid()));
+            entity.setMembername(param.getMembername());
+            String tags = param.getMembertags();
+            if (tags == null) {
+                entity.setMembertags("");
+            } else {
+                //替换中文逗号为英文逗号
+                entity.setMembertags(tags.replace(",", ","));
+            }
+            entity.setImageurl(param.getImageurl());
+            entity.setUpdatetime(new Date());
+            iGzMemberinfoMapper.updateById(entity);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult columnsourcedelete(Long memberid, HttpServletRequest request) {
+        iGzMemberinfoMapper.delete(new QueryWrapper<GzMemberinfo>().eq("memberid", memberid));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult<GzMemberinfo> columnsourceDetail(Long memberid, HttpServletRequest request) {
+        GzMemberinfo entity = iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", memberid));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), entity);
+    }
+
+    @Override
+    public PageResult<InforManQueryResult> informManquery(InforManQueryParam param, HttpServletRequest request) {
+        PageResult<InforManQueryResult> pageResult = new PageResult<>();
+        IPage<InforManQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<InforManQueryResult> resultIPage = iNoticemsgMapper.informManquery(page, param);
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultIPage.getPages());
+        pageResult.setCurrent(resultIPage.getCurrent());
+        pageResult.setTotal(resultIPage.getTotal());
+        pageResult.setPageSize(resultIPage.getSize());
+        pageResult.setData(resultIPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult<InformManinitMessage> informManinit(HttpServletRequest request) {
+        InformManinitMessage message = new InformManinitMessage();
+        List<SiteColumnconfig> siteColumnconfigs = iSiteColumnconfigMapper.selectList(new QueryWrapper<SiteColumnconfig>()
+                .eq("columntype", SysEnums.columntype.getColumntypeString("information"))
+                .eq("isshow", 1));
+        List<GzMemberinfo> gzMemberinfos = iGzMemberinfoMapper.selectList(new QueryWrapper<>());
+        message.setGzMemberinfo(gzMemberinfos);
+        message.setSiteColumnconfig(siteColumnconfigs);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), message);
+    }
+
+    @Override
+    public AjaxResult<SiteColumndetail> informDetail(Long id, HttpServletRequest request) {
+        SiteColumndetail siteColumndetail = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id", id));
+        siteColumndetail.setColumnname(iSiteColumnconfigMapper.selectOne(new QueryWrapper<SiteColumnconfig>().eq("id", siteColumndetail.getColumnid())).getColumnname());
+        siteColumndetail.setSrcname(iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", siteColumndetail.getSrcid())).getMembername());
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), siteColumndetail);
+    }
+
+    @Override
+    public AjaxResult isshow(Long id, HttpServletRequest request) {
+        SiteColumndetail temp = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id", id));
+        temp.setIsshow(temp.getIsshow() == 1 ? 0 : 1);
+        iSiteColumndetailMapper.updateById(temp);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult dealinform(SiteColumndetail param, HttpServletRequest request) {
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if(param.getId() == null){
+            SiteColumndetail config = new SiteColumndetail();
+            try {
+                if(StringUtils.isNotBlank(param.getPublishdate2())){
+                    config.setPublishdate(DateTimeUtils.parseDate(config.getPublishdate2(),
+                            DateTimeUtils.DATE_PATTERN));
+                }else{
+                    config.setPublishdate(new Date());
+                }
+            } catch (ParseException e) {
+               log.error("SiteColumndetail 日期转换异常,请检查");
+            }
+            config.setContext(convertToHtml(config.getContext()));
+
+            if(config.getHits() == null){
+                config.setHits(0L);
+            }
+
+            if(config.getUserid()==null){
+                config.setUserid(user.getAreauserid());
+            }
+            config.setCreaedate(new Date());
+            config.setCreatorid(user.getAutoid());
+            config.setUpdatedate(new Date());
+            config.setModifierid(user.getAutoid());
+            iSiteColumndetailMapper.insert(config);
+        }else{
+            SiteColumndetail temp = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id",param.getId()));
+
+            log.debug("updateSiteColumnDetail:");
+            temp.setContext(convertToHtml(param.getContext()));
+            temp.setTitle(param.getTitle());
+            temp.setCoverimage(param.getCoverimage());
+            temp.setAuthor(param.getAuthor());
+            temp.setBrief(param.getBrief());
+            temp.setIstop(param.getIstop());
+            temp.setStatus(param.getStatus());
+            temp.setUpdatedate(new Date());
+            temp.setModifierid(user.getAutoid());
+            temp.setIsshow(param.getIsshow());
+            temp.setHits((param.getHits()) == null ? 0L : param.getHits());
+            temp.setSrcid(param.getSrcid());
+            try {
+                if(StringUtils.isNotBlank(param.getPublishdate2())){
+                    temp.setPublishdate(DateTimeUtils.parseDate(param.getPublishdate2(),
+                            DateTimeUtils.DATE_PATTERN));
+                }
+            } catch (ParseException e) {
+                log.error("SiteColumndetail 日期转换异常,请检查");
+            }
+            iSiteColumndetailMapper.updateById(temp);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult auditinform(Long id, Integer flag, HttpServletRequest request) {
+        SiteColumndetail temp = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id",id));
+        if(flag==1){
+            temp.setStatus(20);
+        }else{
+            temp.setStatus(30);
+        }
+
+        iSiteColumndetailMapper.updateById(temp);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult deleteinform(Long id, HttpServletRequest request) {
+        iSiteColumndetailMapper.delete(new QueryWrapper<SiteColumndetail>().eq("id",id));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    private void saveSendAllUser(Noticemsg noticeMsg) {
+        iNoticemsgMapper.insert(noticeMsg);
+
+        //查所有的全体交易商
+        List<Useraccount> userAccountList = iUseraccountMapper.selectList(new QueryWrapper<Useraccount>().eq("usertype", SysEnums.SZDivideTargetType.INVESTOR.getCode()));
+        if (CollectionUtils.isNotEmpty(userAccountList)) {
+            for (Useraccount ua : userAccountList) {
+                Msgreceiver mr = new Msgreceiver();
+                mr.setAutoid(noticeMsg.getAutoid());
+                mr.setManagerid(ua.getUserid());
+                mr.setReadstatus(1);//消息状态  未阅读
+                mr.setReceivertype(2);
+                mr.setUpdatetime(new Date());
+                iMsgreceiverMapper.insert(mr);
+            }
+        }
+    }
+
+    private void saveSendOnlyMember(Noticemsg noticeMsg, String[] split) {
+        iNoticemsgMapper.insert(noticeMsg);
+
+        for (String memberid : split) {
+            //会员管理员   记录到管理端消息接收表
+            Map<String, Object> maps = new HashMap<String, Object>();
+            List<Systemmanager> users = iSystemmanagerMapper.selectList(new QueryWrapper<Systemmanager>()
+                    .eq("managerstatus", SysEnums.SysStatus.ok.getCode())
+                    .eq("areauserid", Long.valueOf(memberid)));
+            addMsgreceiver(noticeMsg, users);
+        }
+    }
+
+    private void saveSendMember(Noticemsg noticeMsg, String[] split) {
+        iNoticemsgMapper.insert(noticeMsg);
+
+        for (String memberid : split) {
+            //会员   记录到会员消息接受表
+            Memberrecv ur = new Memberrecv();
+            ur.setMsgid(noticeMsg.getAutoid());
+            ur.setMemberid(Long.valueOf(memberid));
+            iMemberrecvMapper.insert(ur);
+            //会员管理员   记录到管理端消息接收表
+            List<Systemmanager> users = iSystemmanagerMapper.selectList(new QueryWrapper<Systemmanager>()
+                    .eq("managerstatus", SysEnums.SysStatus.ok.getCode())
+                    .eq("areauserid", Long.valueOf(memberid)));
+            addMsgreceiver(noticeMsg, users);
+        }
+    }
+
+    private void saveSendAll(Noticemsg noticeMsg) {
+        iNoticemsgMapper.insert(noticeMsg);
+
+        //查所有的管理端用户包括机构用户,平台用户,会员用户
+        List<Systemmanager> users = iSystemmanagerMapper.selectList(new QueryWrapper<Systemmanager>().eq("managerstatus", SysEnums.SysStatus.ok.getCode()));
+        addMsgreceiver(noticeMsg, users);
+    }
+
+    private void addMsgreceiver(Noticemsg noticeMsg, List<Systemmanager> users) {
+        if (CollectionUtils.isNotEmpty(users)) {
+            for (Systemmanager u : users) {
+                Msgreceiver mr = new Msgreceiver();
+                mr.setManagerid(u.getAutoid());
+                mr.setAutoid(noticeMsg.getAutoid());
+                mr.setReadstatus(1);//消息状态  未阅读
+                mr.setReceivertype(1);
+                iMsgreceiverMapper.insert(mr);
+            }
+        }
+    }
+
+    public String convertToHtml(String oriString) {
+        String desString = StringEscapeUtils.unescapeHtml4(oriString);
+        String ignorStr = "<p>&nbsp;</p>";
+        if(desString != null){
+            desString =	desString.replaceAll("(\\r\\n|\\r|\\n|\\n\\r)", "\n").trim();
+            desString =	desString.replaceAll("(\\\\r\\\\n|\\\\r|\\\\n|\\\\n\\\\r)", "\n").trim();
+            desString =	desString.replaceAll(ignorStr, "\n").trim();
+
+            //删除最后的\n
+            while (desString.endsWith("\n")){
+                desString = desString.substring(0, desString.length() - 1).trim();
+            }
+
+            //删除最后的ignorStr
+            while (desString.endsWith(ignorStr)){
+                desString = desString.substring(0, desString.length() - ignorStr.length()).trim();
+            }
+
+//			desString =	desString.replaceAll("(\\n)", "<br />").trim();
+        }
+        return desString;
+    }
+}

+ 134 - 10
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SystemSetUpServiceImpl.java

@@ -16,21 +16,16 @@ import com.muchinfo.mtp3common.utils.DateTimeUtils;
 import com.muchinfo.mtp3common.utils.ExportUtil;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3common.vo.ExportResult;
-import com.muchinfo.mtp3interface.mapper.ISystemmanagerMapper;
-import com.muchinfo.mtp3interface.mapper.IUseraccountMapper;
-import com.muchinfo.mtp3pojos.entity.Systemmanager;
-import com.muchinfo.mtp3pojos.entity.Useraccount;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorResult;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogResult;
+import com.muchinfo.mtp3interface.mapper.*;
+import com.muchinfo.mtp3pojos.entity.*;
+import com.muchinfo.mtp3pojos.vo.systemsetup.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class SystemSetUpServiceImpl implements ISystemSetUpService {
@@ -41,7 +36,12 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
     private ICommonService iCommonService;
     @Resource
     private IUseraccountMapper iUseraccountMapper;
-
+    @Resource
+    private ISystemmanagerlogMapper iSystemmanagerlogMapper;
+    @Resource
+    private IWskhBlacklistMapper iWskhBlacklistMapper;
+    @Resource
+    private IIpbacklistMapper iIpbacklistMapper;
 
     @Override
     public PageResult<SystemUserLogResult> queryByPage(SystemUserLogParam param, HttpServletRequest request) {
@@ -138,4 +138,128 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
+
+    @Override
+    public PageResult<YmrslQueryResult> querymrsl(YmrslQueryParam param, HttpServletRequest request) {
+        IPage<YmrslQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<YmrslQueryResult> queryResultIPage = iSystemmanagerMapper.querymrsl(page, param);
+        PageResult<YmrslQueryResult> 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<Systemmanagerlog> view(Long id, HttpServletRequest request) {
+        Systemmanagerlog userLog = iSystemmanagerlogMapper.selectOne(new QueryWrapper<Systemmanagerlog>().eq("autoid", id));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), userLog);
+    }
+
+    @Override
+    public PageResult<WskhBlacklist> queryBlackList(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        IPage<WskhBlacklist> page = new Page<>(pageNum, pageSize);
+        IPage<WskhBlacklist> queryResultIPage = iWskhBlacklistMapper.selectPage(page, new QueryWrapper<>());
+        PageResult<WskhBlacklist> 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 dealBlackList(BlackListAddParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (systemmanager.getReletype() != 1) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
+        }
+        if (param.getAutoid() == null) {
+            WskhBlacklist blacklist = new WskhBlacklist();
+            if (checkOnlyOne(param)) {
+                return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM028.getCode(), request.getHeader("Accept-Language"));
+            }
+            blacklist.setCreatetime(new Date());
+            blacklist.setOperatorid(systemmanager.getAutoid());
+            blacklist.setCardtype(param.getCardtype());
+            blacklist.setCardnum(param.getCardnum());
+            iWskhBlacklistMapper.insert(blacklist);
+        } else {
+            if (checkOnlyOne(param)) {
+                return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM028.getCode(), request.getHeader("Accept-Language"));
+            }
+            WskhBlacklist blacklist = iWskhBlacklistMapper.selectOne(new QueryWrapper<WskhBlacklist>().eq("autoid", param.getAutoid()));
+            blacklist.setOperatorid(systemmanager.getAutoid());
+            blacklist.setCardtype(param.getCardtype());
+            blacklist.setCardnum(param.getCardnum());
+            blacklist.setCreatetime(new Date());
+            iWskhBlacklistMapper.updateById(blacklist);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult delBlackList(Long id, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (systemmanager.getReletype() != 1) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
+        }
+        iWskhBlacklistMapper.delete(new QueryWrapper<WskhBlacklist>().eq("autoid", id));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @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));
+        PageResult<Ipbacklist> 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 addIPList(IpListDelParam param, HttpServletRequest request) {
+        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)){
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language"));
+        }
+        Ipbacklist ip = new Ipbacklist();
+        ip.setIp(param.getIp());
+        ip.setIptype(param.getIptype());
+        iIpbacklistMapper.insert(ip);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult delIPList(IpListDelParam param, HttpServletRequest request) {
+        iIpbacklistMapper.delete(new QueryWrapper<Ipbacklist>()
+                .eq("ip", param.getIp())
+                .eq("iptype", param.getIptype()));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    private boolean checkOnlyOne(BlackListAddParam blacklist) {
+        Long num = iWskhBlacklistMapper.selectCount(new QueryWrapper<WskhBlacklist>()
+                .eq("cardtype", blacklist.getCardtype())
+                .eq("cardnum", blacklist.getCardnum()));
+        return num.intValue() > 0;
+    }
 }

+ 165 - 0
mtp3-century/src/main/resources/mapper/NoticemsgMapper.xml

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.muchinfo.mtp3interface.mapper.INoticemsgMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.muchinfo.mtp3pojos.entity.Noticemsg">
+        <id column="AUTOID" property="autoid" />
+        <result column="MSGTYPE" property="msgtype" />
+        <result column="TITLE" property="title" />
+        <result column="CONTENT" property="content" />
+        <result column="SCHEDULETIME" property="scheduletime" />
+        <result column="PUBLISHER" property="publisher" />
+        <result column="SENDTYPE" property="sendtype" />
+        <result column="USERID" property="userid" />
+        <result column="ISTOP" property="istop" />
+        <result column="SENTSTATUS" property="sentstatus" />
+        <result column="ENDTIME" property="endtime" />
+        <result column="CREATORID" property="creatorid" />
+        <result column="CREATETIME" property="createtime" />
+        <result column="AUDITORUSERID" property="auditoruserid" />
+        <result column="AUDITTIME" property="audittime" />
+        <result column="AUDITREMARK" property="auditremark" />
+        <result column="MSGICONURL" property="msgiconurl" />
+        <result column="ISFORCEDISPLAY" property="isforcedisplay" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        AUTOID, MSGTYPE, TITLE, CONTENT, SCHEDULETIME, PUBLISHER, SENDTYPE, USERID, ISTOP, SENTSTATUS, ENDTIME, CREATORID, CREATETIME, AUDITORUSERID, AUDITTIME, AUDITREMARK, MSGICONURL, ISFORCEDISPLAY
+    </sql>
+
+    <select id="query" resultType="com.muchinfo.mtp3pojos.vo.notice.NoticeMsgQueryResult">
+        select
+        n.*,
+        ua.accountname,
+        (case when n.userid is not null then to_char(ua2.userid) || '/' || ua2.accountname end) "RECIPIENT"
+        from noticemsg n
+        left join useraccount ua on ua.userid = to_number(n.publisher)
+        left join useraccount ua2 on ua2.userid = n.userid
+        <where>
+            <if test="vo.publisher != null and vo.publisher != '' ">
+                and n.publisher = #{vo.publisher, jdbcType=VARCHAR}
+            </if>
+            <if test="vo.title != null and vo.title != ''">
+                and n.title like '%'||#{vo.title,jdbcType=VARCHAR}||'%'
+            </if>
+            <if test="vo.msgtype != null and vo.msgtype != -1 ">
+                and n.msgtype = #{vo.msgtype, jdbcType=INTEGER}
+            </if>
+            <if test="vo.sendtype != null and vo.sendtype != -1 ">
+                and n.sendtype = #{vo.sendtype, jdbcType=INTEGER}
+            </if>
+            <if test="vo.content != null and vo.content != ''">
+                and n.content like '%'||#{vo.content,jdbcType=VARCHAR}||'%'
+            </if>
+            <if test="vo.userid != null and vo.userid != '' ">
+                and n.userid = #{vo.userid}
+            </if>
+            <if test="vo.isforcedisplay != null">
+                and n.isforcedisplay = #{vo.isforcedisplay}
+            </if>
+        </where>
+        order by n.scheduletime desc
+    </select>
+    <select id="smsquery" resultType="com.muchinfo.mtp3pojos.vo.notice.SmsQueryResult">
+        select
+        s.msgid,s.templid,s.msgtype,s.status,s.errinfo,
+        s.priority,s.failedphone,s.recvphone,s.createtime,s.updatetime,
+        u.userid,ua.broker, spd.tempname
+        from SMSCOLLECTION s
+        left join USERINFO u on s.recvphone = u.telphone
+        left join USERACCOUNT ua on u.userid = ua.userid
+        left join smstemplatedefine spd on s.templid = spd.templid
+        <where>
+            <if test="vo.recvphone != null and vo.recvphone != ''">
+                and s.recvphone = #{vo.recvphone,jdbcType=VARCHAR}
+            </if>
+            <if test="vo.msgtype != null">
+                and s.msgtype = #{vo.msgtype,jdbcType=INTEGER}
+            </if>
+            <if test="vo.status != null">
+                <choose>
+                    <when test="vo.status == 1">
+                        and s.status in (1)
+                    </when>
+                    <when test="vo.status == 3">
+                        and s.status in (0,3)
+                    </when>
+                    <when test="vo.status == 4">
+                        and s.status in (-1,4)
+                    </when>
+                </choose>
+            </if>
+            <if test="vo.userid != null and vo.userid != '' ">
+                and ua.membersuserid = #{vo.userid}
+            </if>
+        </where>
+        order by decode(s.status,'4',1,'1',2,'3',3), s.createtime desc
+    </select>
+    <select id="columnquery" resultType="com.muchinfo.mtp3pojos.vo.notice.ColumnQueryResult">
+        select t.* from site_columnconfig t
+        <where>
+            <if test="vo.id != null">
+                and id=#{vo.id}
+            </if>
+            <if test="vo.columntype != null">
+                and columntype=#{vo.columntype}
+            </if>
+            <if test="vo.columnname != null and vo.columnname != ''">
+                and columnname like '%'||#{vo.columnname}||'%'
+            </if>
+            <if test="vo.isshow != null">
+                and isshow=#{vo.isshow}
+            </if>
+        </where>
+        order by id
+    </select>
+    <select id="columnsourcequery" resultType="com.muchinfo.mtp3pojos.vo.notice.ColumnSourceQueryResult">
+        select
+        *
+        from gz_memberinfo t
+        where 1=1
+        <if test="smembername != null and smembername != ''">
+            and t.membername like '%'||#{smembername}||'%'
+        </if>
+
+        order by t.orderindex, t.membername
+    </select>
+    <select id="informManquery" resultType="com.muchinfo.mtp3pojos.vo.notice.InforManQueryResult">
+        <choose>
+            <when test=" vo.columnid != null and vo.columnid == -1">
+                select d.id,d.title,d.creaedate,#{vo.userid} userid,s.username as creatoruser,
+                c.id columnid, c.columnname
+                from site_columnconfig c
+                left join site_columndetail d on c.id = d.columnid and d.userid=#{vo.userid}
+                left join systemmanager s on d.creatorid = s.autoid
+                where c.columntype=100 and c.id !=3
+            </when>
+            <otherwise>
+                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>
+                    <if test="title != null and title != ''">
+                        and t.title like '%'||#{title}||'%'
+                    </if>
+                    <if test="status != null">
+                        and t.status=#{status}
+                    </if>
+                    <if test="isshow != null">
+                        and t.isshow=#{isshow}
+                    </if>
+                </where>
+                order by t.istop desc, t.publishdate desc
+            </otherwise>
+        </choose>
+    </select>
+
+
+</mapper>

+ 13 - 0
mtp3-century/src/main/resources/mapper/SystemmanagerMapper.xml

@@ -242,4 +242,17 @@
         </where>
         order by t.loginstatus,t.loginid
     </select>
+    <select id="querymrsl" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.YmrslQueryResult">
+        select t.*,m.marketname "marketname" from MarketRunStatusLog t
+        left join market m on t.marketid=m.marketid
+        <where>
+            <if test="vo.marketid != null">
+                and t.marketid = #{vo.marketid}
+            </if>
+            <if test="vo.tradedate != null and vo.tradedate !=''">
+                and t.tradedate = #{vo.tradedate}
+            </if>
+        </where>
+        order by t.updatetime desc
+    </select>
 </mapper>

+ 9 - 3
mtp3-century/src/main/resources/message_en.properties

@@ -24,12 +24,15 @@ message_code_system024=Review Rejected
 message_code_system025=Non trading account cannot be closed for review
 message_code_system026=The fund account has not been terminated and cannot be closed
 message_code_system027=There is still {0} chance of error left, Account or password mismatch reaches {1} times, Login account will be locked for {2} minute {3}
+message_code_system028=This document is already on the blacklist!
+message_code_system029=The IP address cannot be a null value!
+message_code_system030=IP address duplication!
 
 message_error_code_system001=Token invalid, please log in again!
 message_error_code_system002=operation failed
 message_error_code_system003=The user does not have operational permissions
-message_error_code_system004=File upload failed, please contact the management personnel for handling
-message_error_code_system005=Your application has been submitted, please check the results later
+message_error_code_system004=File upload failed, please contact the management personnel for handling\uFF01
+message_error_code_system005=Your application has been submitted, please check the results later\u3002
 message_error_code_system006=Request timed out, please try again later
 message_error_code_system007=System maintenance in progress, please try again later
 message_error_code_system008=System exception, please contact the administrator
@@ -41,7 +44,7 @@ message_error_code_system013=The user password has expired
 message_error_code_system014=User account disabled
 message_error_code_system015=There are unprocessed breach requests that cannot be initiated repeatedly
 message_error_code_system016=The steps of the performance plan have been changed and an extension cannot be applied for
-message_error_code_system017=Deposit transfer market, please select the issuer of the product【{0}】
+message_error_code_system017=Deposit transfer market, please select the issuer of the product\u3010{0}\u3011
 message_error_code_system018=Please execute when the system completes processing successfully at the end of the day
 
 login_error_code_001=Account or password error
@@ -142,3 +145,6 @@ warehouse_error_code_02=Duplicate warehouse code
 warehouse_error_code_03=Duplicate warehouse name
 warehouse_error_code_04=Data error: Missing institutional data
 warehouse_error_code_05=This warehouse is already associated with a spot variety and cannot be cancelled
+
+message_notice_error_code_01=Please select at least one member\uFF01
+message_notice_error_code_02=Member not found\uFF01\uFF01\uFF01

+ 151 - 145
mtp3-century/src/main/resources/message_th.properties

@@ -1,145 +1,151 @@
-message_code_system001=ความสำเร็จในการดำเนินงาน
-message_code_system003=แก้ไขสำเร็จ
-message_code_system004=ความสำเร็จในการลงทะเบียน
-message_code_system005=ความสำเร็จในการยกเลิกสัญญา
-message_code_system006=รับ CAPTCHA สำเร็จ
-message_code_system007=เข้าสู่ระบบสำเร็จ
-message_code_system008=ความสำเร็จในการออกคิม
-message_code_system009=ความสำเร็จในการลงทุน
-message_code_system010=การรับรองผู้ใช้ ผ่าน
-message_code_system011=การดำเนินการกู้คืนตำแหน่งตัดประสบความสำเร็จ
-message_code_system012=ชำระเงินค่าสินค้าสำเร็จ
-message_code_system013=ประสบความสำเร็จในการเขย่าตัวเลขก่อนการขาย
-message_code_system014=ความสำเร็จในการขายพรีเซล
-message_code_system015=สมัครล่วงหน้าสำเร็จ
-message_code_system016=ข้อมูลการยืนยันการใช้สิทธิได้ถูกส่งแล้วและกำลังดำเนินการอยู่ โปรดตรวจสอบอีกครั้งในภายหลัง
-message_code_system017=สมัครสำเร็จ
-message_code_system018=ข้อมูลการติดต่อการปฏิบัติงานได้ถูกส่งไปแล้ว กรุณาสอบถามอีกครั้งในภายหลัง
-message_code_system019=ความสำเร็จในการดำเนินการ
-message_code_system020=การนำเข้าแบทช์การเปิดสถานะสำเร็จแล้ว
-message_code_system021=ส่งเรียบร้อยแล้วโอนเงินโดยอัตโนมัติหลังจากปิดตลาด
-message_code_system022=ข้อมูลนี้ได้รับการตรวจสอบแล้วเสร็จหรือประมวลผล
-message_code_system023=ไม่พบบัญชีเงินของผู้ค้า
-message_code_system024=การปฏิเสธการตรวจสอบ
-message_code_system025=บัญชีที่ไม่ใช่ตัวแทนจำหน่ายและไม่สามารถตรวจสอบได้โดยผู้ขาย
-message_code_system026=บัญชีเงินไม่ถูกยกเลิก ขายไม่ออก
-message_code_system027=เหลือโอกาสผิดพลาด {0} ครั้ง หมายเลขบัญชีหรือรหัสผ่านไม่ตรงกันถึง {1} ครั้ง หมายเลขบัญชีล็อกอินจะถูกล็อกไว้ {2} นาที {3}
-
-message_error_code_system001=โทเค็นล้มเหลวโปรดเข้าสู่ระบบอีกครั้ง!
-message_error_code_system002=การดำเนินการล้มเหลว!
-message_error_code_system003=ไม่มีสิทธิ์ในการดำเนินงานของผู้ใช้รายนี้!
-message_error_code_system004=การอัพโหลดไฟล์ล้มเหลว กรุณาติดต่อเจ้าหน้าที่เพื่อดำเนินการ!
-message_error_code_system005=ส่งใบสมัครของคุณแล้ว โปรดตรวจสอบผลลัพธ์ในภายหลัง。
-message_error_code_system006=ขอหมดเวลาโปรดลองอีกครั้งในภายหลัง
-message_error_code_system007=ในระหว่างการบำรุงรักษาระบบ โปรดลองอีกครั้งในภายหลัง
-message_error_code_system008=ระบบผิดปกติ ติดต่อผู้ดูแลระบบ
-message_error_code_system009=บริการรับรองไม่ถูกต้อง
-message_error_code_system010=ไม่มีบัญชีผู้ใช้
-message_error_code_system011=บัญชีหรือรหัสผ่านไม่ถูกต้อง
-message_error_code_system012=บัญชีผู้ใช้ถูกล็อค
-message_error_code_system013=รหัสผ่านผู้ใช้ล้มเหลว
-message_error_code_system014=บัญชีผู้ใช้ถูกปิดใช้งาน
-message_error_code_system015=มีการยื่นขอผิดนัดที่ยังไม่ได้ดำเนินการและไม่สามารถเริ่มต้นซ้ำได้
-message_error_code_system016=ขั้นตอนการใช้สิทธิมีการเปลี่ยนแปลงและไม่สามารถขอขยายเวลาได้
-message_error_code_system017=ตลาดโอนเงินมัดจำ โปรดเลือกผู้ออกสินค้า【{0}】
-message_error_code_system018=โปรดดำเนินการเมื่อการประมวลผลสิ้นสุดวันที่ระบบสำเร็จ
-
-login_error_code_001=บัญชีหรือรหัสผ่านไม่ถูกต้อง
-login_error_code_002=ไม่สามารถเข้าถึงได้โดยไม่ได้รับอนุญาต! กรุณาติดต่อผู้ดูแลระบบเพื่อจัดการ!
-login_error_code_003=ล็อกอิน!
-login_error_code_004=บัญชีถูกปิดใช้งานโปรดติดต่อผู้ดูแลระบบ
-login_error_code_005=หมายเลขบัญชีล็อกอินมีอยู่แล้ว
-login_error_code_006=ผู้ใช้รายนี้ไม่มีอยู่จริงโปรดติดต่อผู้ดูแลระบบเพื่อจัดการ
-login_error_code_007=ไม่อนุญาตให้ปิดการใช้งานบัญชีที่ล็อกอินปัจจุบัน
-login_error_code_008=ไม่สามารถใช้รหัสผ่านเดิมได้
-login_error_code_009=รหัสผ่านเก่าผิดพลาด
-login_error_code_010=ข้อมูลตัวละครผิดพลาด
-
-role_error_code_001=ชื่อตัวละครมีอยู่แล้ว
-
-market_run_message_001=บังคับให้ออฟไลน์ถูกส่งแล้ว
-
-organ_error_code_001=บทบาทที่ได้รับมอบหมายและไม่สามารถออกจากระบบได้
-organ_error_code_002=มีหน่วยงานระดับล่างไม่สามารถออกจากระบบได้
-organ_error_code_003=มีนักลงทุนระดับล่างไม่สามารถออกจากระบบได้
-organ_error_code_004=มีเงินเหลือและไม่สามารถออกจากระบบได้
-organ_error_code_005=มีสถานะที่เหลือและไม่สามารถออกจากระบบได้
-organ_error_code_006=หมายเลขเอกสารได้รับการบันทึกตามปกติและไม่สามารถกู้คืนได้
-organ_error_code_007=หมายเลขโทรศัพท์มือถือมีการบันทึกปกติและไม่สามารถกู้คืนได้
-organ_error_code_008=หน่วยงานที่เหนือกว่าอยู่ในสภาพที่ไม่ปกติและไม่สามารถกู้คืนได้
-organ_error_code_009=สมาชิกที่สังกัดไม่มีบทบาทเป็นนายหน้าและไม่สามารถกู้คืนได้
-organ_error_code_010=รหัสหรือรหัสสถาบันซ้ำ
-organ_error_code_011=หมายเลขเอกสารมีอยู่แล้ว
-organ_error_code_012=หมายเลขเอกสารอยู่ในบัญชีดำและไม่สามารถเปิดบัญชีได้
-organ_error_code_013=มีชื่ออยู่แล้ว
-organ_error_code_014=ผู้ดูแลระบบ เข้าสู่ระบบ หมายเลขบัญชี ทำซ้ำ
-organ_error_code_015=เพิ่มล้มเหลว ติดต่อผู้ดูแลระบบ
-organ_error_code_016=มีหมายเลขโทรศัพท์มือถืออยู่แล้ว
-organ_error_code_017=ชื่อธุรกิจมีอยู่แล้ว
-organ_error_code_018=ข้อมูลของหน่วยงานมีการเปลี่ยนแปลง กรุณารีเฟรชข้อมูล
-organ_error_code_019=มีหมายเลขเอกสารหรือหมายเลขโทรศัพท์มือถืออยู่แล้ว
-organ_error_code_020=ตรวจสอบปฏิเสธเหตุผล ไม่เกิน 80 คำ
-organ_error_code_021=ข้อมูลนักลงทุนมีการเปลี่ยนแปลงโปรดรีเฟรชข้อมูล
-organ_error_code_022=ไม่มีสถานะรอการตรวจสอบและไม่สามารถถอนได้
-organ_error_code_023=สมาชิกที่สังกัดอยู่ในสถานะไม่ปกติและไม่สามารถตรวจสอบผ่าน
-organ_error_code_024=หน่วยงานที่สังกัดอยู่ในสถานะไม่ปกติไม่สามารถตรวจสอบผ่าน
-organ_error_code_025=โบรกเกอร์ที่อยู่ในสถานะไม่ปกติและไม่สามารถตรวจสอบได้ ผ่าน
-organ_error_code_026=มีสมาชิกเป็นนายหน้าซื้อขายหลักทรัพย์ระดับล่างและไม่สามารถลบได้
-organ_error_code_027=มีคลังสินค้าระดับล่างและไม่สามารถลบออกได้
-organ_error_code_028=สมาชิกผู้ดูแลสภาพคล่องได้ลงนามและไม่สามารถลบได้
-organ_error_code_029=สมาชิกผู้ดูแลสภาพคล่องเป็นผู้อ้างอิงเริ่มต้นและไม่สามารถลบได้
-organ_error_code_030=สมาชิกผู้ดูแลสภาพคล่องได้กำหนดค่าความสัมพันธ์ของคู่แข่งระดับที่สองและไม่สามารถลบได้
-organ_error_code_031=สมาชิก Marketmaker ถูกอ้างอิงโดย OTC Options Marketmaker และไม่สามารถลบได้
-organ_error_code_032=มีประเภทของคะแนนและไม่สามารถลบออกได้
-organ_error_code_033=อ้างสถาบันไม่สามารถลบได้
-organ_error_code_034=ผู้บังคับบัญชาไม่สามารถทำเพื่อตนเองได้
-organ_error_code_035=ค่าอัตราส่วนต้องไม่เกิน 100
-
-
-profit_shar_error_code_001=กรุณาลบการกำหนดค่าการแบ่งงานก่อน
-profit_shar_error_code_002=กรุณาลบคนกลุ่มออกก่อน
-profit_shar_error_code_003=มีการกำหนดค่าการแบ่งประเภทของค่าธรรมเนียมนี้อยู่แล้ว
-
-query_error_code_001=กรุณาเลือกสอบถามข้อมูลตลาด
-query_error_code_002=สอบถามประวัติ กรุณาเลือกวันที่เริ่มต้น
-query_error_code_003=สอบถามประวัติ กรุณาเลือกวันสิ้นสุด
-query_error_code_004=ไม่มีสิทธิ์นี้
-query_error_code_005=ไม่มีข้อมูลที่จะส่งออก
-query_error_code_006=ส่งออกล้มเหลว, ติดต่อผู้ดูแลระบบ!
-query_error_code_007=กรุณากรอกบัญชีเงินทุน
-query_error_code_008=ข้อผิดพลาดของตลาดหรือสถานะไม่เปิดตลาด
-query_error_code_009=พารามิเตอร์ผิดพลาด
-query_error_code_010=แฟ้มนำเข้าว่างเปล่า
-
-report_error_code_001=วันเริ่มต้นการซื้อขาย{0},สิ้นสุดวันซื้อขาย {1} เกิดข้อผิดพลาดในการนับรายงานการดำเนินการอีกครั้ง
-
-settlement_message_001=ยืนยันการชำระเงินเสร็จสิ้น: {0} ความสำเร็จของบาร์, {1} แถบล้มเหลว
-settlement_message_002=ข้อมูลมีการเปลี่ยนแปลงโปรดรีเฟรชลองอีกครั้ง
-
-pwd_error_code_001=กรุณากรอกรหัสผ่านเก่า
-pwd_error_code_002=กรุณากรอกรหัสผ่านใหม่
-pwd_error_code_003=กรุณากรอกรหัสผ่านใหม่เพื่อยืนยัน
-pwd_error_code_004=รหัสผ่านไม่สอดคล้องกันสองครั้ง
-pwd_error_code_005=รหัสผ่านเก่าผิดพลาด
-
-amount_error_code_001=จำนวนเงินเป็น 0 ไม่มีการประมวลผล!
-
-traAcc_error_code_001=เข้าสู่ระบบบัญชีซ้ำ, กรุณาแตะ Resurve และส่งอีกครั้ง!
-
-investor_error_code_001=ไม่พบบัญชีเงิน
-investor_error_code_002=บัญชีที่ไม่ใช่นักลงทุนและไม่สามารถตรวจสอบได้โดยผู้ขาย
-investor_error_code_003=บัญชีเงินไม่ถูกยกเลิก ขายไม่ออก
-investor_error_code_004=บัญชีมีข้อมูลที่เกี่ยวข้อง เช่น เงินทุน การเปิดโพซิชั่น และไม่สามารถออกจากระบบได้
-investor_error_code_005=ไม่มีการตอบสนองต่อการร้องขอบัญชีเงินทุน.
-investor_error_code_006=ชื่อกลุ่มซ้ำ.
-investor_error_code_007=กรุณาเลือกนักลงทุน.
-investor_error_code_008={0}การจัดกลุ่มที่ได้รับมอบหมาย.
-investor_error_code_009=โปรดลบนักลงทุนทั้งหมดภายใต้กลุ่มนี้ก่อน.
-investor_error_code_010=โปรดลบการตั้งค่าส่วนบุคคลของกลุ่มนั้นก่อน.
-investor_error_code_011=ค่าอัตราส่วนต้องไม่เกิน 10,000
-
-warehouse_error_code_01=รหัสคลังสินค้า สูงสุด 10 หลัก
-warehouse_error_code_02=รหัสคลังสินค้าซ้ำ
-warehouse_error_code_03=ชื่อคลังสินค้าซ้ำกัน
-warehouse_error_code_04=ข้อผิดพลาดของข้อมูล: ข้อมูลสถาบันหายไป
-warehouse_error_code_05=คลังสินค้านี้มีความสัมพันธ์กับพันธุ์สปอตและไม่สามารถออกจากระบบได้
+message_code_system001=\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E07\u0E32\u0E19
+message_code_system003=\u0E41\u0E01\u0E49\u0E44\u0E02\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+message_code_system004=\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E25\u0E07\u0E17\u0E30\u0E40\u0E1A\u0E35\u0E22\u0E19
+message_code_system005=\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E22\u0E01\u0E40\u0E25\u0E34\u0E01\u0E2A\u0E31\u0E0D\u0E0D\u0E32
+message_code_system006=\u0E23\u0E31\u0E1A CAPTCHA \u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+message_code_system007=\u0E40\u0E02\u0E49\u0E32\u0E2A\u0E39\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+message_code_system008=\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E2D\u0E2D\u0E01\u0E04\u0E34\u0E21
+message_code_system009=\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E25\u0E07\u0E17\u0E38\u0E19
+message_code_system010=\u0E01\u0E32\u0E23\u0E23\u0E31\u0E1A\u0E23\u0E2D\u0E07\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49 \u0E1C\u0E48\u0E32\u0E19
+message_code_system011=\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E01\u0E39\u0E49\u0E04\u0E37\u0E19\u0E15\u0E33\u0E41\u0E2B\u0E19\u0E48\u0E07\u0E15\u0E31\u0E14\u0E1B\u0E23\u0E30\u0E2A\u0E1A\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+message_code_system012=\u0E0A\u0E33\u0E23\u0E30\u0E40\u0E07\u0E34\u0E19\u0E04\u0E48\u0E32\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+message_code_system013=\u0E1B\u0E23\u0E30\u0E2A\u0E1A\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E40\u0E02\u0E22\u0E48\u0E32\u0E15\u0E31\u0E27\u0E40\u0E25\u0E02\u0E01\u0E48\u0E2D\u0E19\u0E01\u0E32\u0E23\u0E02\u0E32\u0E22
+message_code_system014=\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E02\u0E32\u0E22\u0E1E\u0E23\u0E35\u0E40\u0E0B\u0E25
+message_code_system015=\u0E2A\u0E21\u0E31\u0E04\u0E23\u0E25\u0E48\u0E27\u0E07\u0E2B\u0E19\u0E49\u0E32\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+message_code_system016=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E01\u0E32\u0E23\u0E22\u0E37\u0E19\u0E22\u0E31\u0E19\u0E01\u0E32\u0E23\u0E43\u0E0A\u0E49\u0E2A\u0E34\u0E17\u0E18\u0E34\u0E44\u0E14\u0E49\u0E16\u0E39\u0E01\u0E2A\u0E48\u0E07\u0E41\u0E25\u0E49\u0E27\u0E41\u0E25\u0E30\u0E01\u0E33\u0E25\u0E31\u0E07\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E2D\u0E22\u0E39\u0E48 \u0E42\u0E1B\u0E23\u0E14\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07\u0E43\u0E19\u0E20\u0E32\u0E22\u0E2B\u0E25\u0E31\u0E07
+message_code_system017=\u0E2A\u0E21\u0E31\u0E04\u0E23\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+message_code_system018=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E01\u0E32\u0E23\u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E01\u0E32\u0E23\u0E1B\u0E0F\u0E34\u0E1A\u0E31\u0E15\u0E34\u0E07\u0E32\u0E19\u0E44\u0E14\u0E49\u0E16\u0E39\u0E01\u0E2A\u0E48\u0E07\u0E44\u0E1B\u0E41\u0E25\u0E49\u0E27 \u0E01\u0E23\u0E38\u0E13\u0E32\u0E2A\u0E2D\u0E1A\u0E16\u0E32\u0E21\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07\u0E43\u0E19\u0E20\u0E32\u0E22\u0E2B\u0E25\u0E31\u0E07
+message_code_system019=\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E43\u0E19\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23
+message_code_system020=\u0E01\u0E32\u0E23\u0E19\u0E33\u0E40\u0E02\u0E49\u0E32\u0E41\u0E1A\u0E17\u0E0A\u0E4C\u0E01\u0E32\u0E23\u0E40\u0E1B\u0E34\u0E14\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E41\u0E25\u0E49\u0E27
+message_code_system021=\u0E2A\u0E48\u0E07\u0E40\u0E23\u0E35\u0E22\u0E1A\u0E23\u0E49\u0E2D\u0E22\u0E41\u0E25\u0E49\u0E27\u0E42\u0E2D\u0E19\u0E40\u0E07\u0E34\u0E19\u0E42\u0E14\u0E22\u0E2D\u0E31\u0E15\u0E42\u0E19\u0E21\u0E31\u0E15\u0E34\u0E2B\u0E25\u0E31\u0E07\u0E08\u0E32\u0E01\u0E1B\u0E34\u0E14\u0E15\u0E25\u0E32\u0E14
+message_code_system022=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E19\u0E35\u0E49\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E01\u0E32\u0E23\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E41\u0E25\u0E49\u0E27\u0E40\u0E2A\u0E23\u0E47\u0E08\u0E2B\u0E23\u0E37\u0E2D\u0E1B\u0E23\u0E30\u0E21\u0E27\u0E25\u0E1C\u0E25
+message_code_system023=\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E40\u0E07\u0E34\u0E19\u0E02\u0E2D\u0E07\u0E1C\u0E39\u0E49\u0E04\u0E49\u0E32
+message_code_system024=\u0E01\u0E32\u0E23\u0E1B\u0E0F\u0E34\u0E40\u0E2A\u0E18\u0E01\u0E32\u0E23\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A
+message_code_system025=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E17\u0E35\u0E48\u0E44\u0E21\u0E48\u0E43\u0E0A\u0E48\u0E15\u0E31\u0E27\u0E41\u0E17\u0E19\u0E08\u0E33\u0E2B\u0E19\u0E48\u0E32\u0E22\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E44\u0E14\u0E49\u0E42\u0E14\u0E22\u0E1C\u0E39\u0E49\u0E02\u0E32\u0E22
+message_code_system026=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E40\u0E07\u0E34\u0E19\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E22\u0E01\u0E40\u0E25\u0E34\u0E01 \u0E02\u0E32\u0E22\u0E44\u0E21\u0E48\u0E2D\u0E2D\u0E01
+message_code_system027=\u0E40\u0E2B\u0E25\u0E37\u0E2D\u0E42\u0E2D\u0E01\u0E32\u0E2A\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14 {0} \u0E04\u0E23\u0E31\u0E49\u0E07 \u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E2B\u0E23\u0E37\u0E2D\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E44\u0E21\u0E48\u0E15\u0E23\u0E07\u0E01\u0E31\u0E19\u0E16\u0E36\u0E07 {1} \u0E04\u0E23\u0E31\u0E49\u0E07 \u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E25\u0E47\u0E2D\u0E01\u0E2D\u0E34\u0E19\u0E08\u0E30\u0E16\u0E39\u0E01\u0E25\u0E47\u0E2D\u0E01\u0E44\u0E27\u0E49 {2} \u0E19\u0E32\u0E17\u0E35 {3}
+message_code_system028=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E14\u0E33\u0E21\u0E35\u0E40\u0E2D\u0E01\u0E2A\u0E32\u0E23\u0E19\u0E35\u0E49\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27!
+message_code_system029=\u0E17\u0E35\u0E48\u0E2D\u0E22\u0E39\u0E48 IP \u0E15\u0E49\u0E2D\u0E07\u0E44\u0E21\u0E48\u0E21\u0E35\u0E04\u0E48\u0E32\u0E27\u0E48\u0E32\u0E07!
+message_code_system030=\u0E17\u0E35\u0E48\u0E2D\u0E22\u0E39\u0E48 IP \u0E0B\u0E49\u0E33\u0E01\u0E31\u0E19!
+
+message_error_code_system001=\u0E42\u0E17\u0E40\u0E04\u0E47\u0E19\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27\u0E42\u0E1B\u0E23\u0E14\u0E40\u0E02\u0E49\u0E32\u0E2A\u0E39\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07!
+message_error_code_system002=\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27!
+message_error_code_system003=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2A\u0E34\u0E17\u0E18\u0E34\u0E4C\u0E43\u0E19\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E07\u0E32\u0E19\u0E02\u0E2D\u0E07\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E23\u0E32\u0E22\u0E19\u0E35\u0E49!
+message_error_code_system004=\u0E01\u0E32\u0E23\u0E2D\u0E31\u0E1E\u0E42\u0E2B\u0E25\u0E14\u0E44\u0E1F\u0E25\u0E4C\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27 \u0E01\u0E23\u0E38\u0E13\u0E32\u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E40\u0E08\u0E49\u0E32\u0E2B\u0E19\u0E49\u0E32\u0E17\u0E35\u0E48\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\uFF01
+message_error_code_system005=\u0E2A\u0E48\u0E07\u0E43\u0E1A\u0E2A\u0E21\u0E31\u0E04\u0E23\u0E02\u0E2D\u0E07\u0E04\u0E38\u0E13\u0E41\u0E25\u0E49\u0E27 \u0E42\u0E1B\u0E23\u0E14\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E1C\u0E25\u0E25\u0E31\u0E1E\u0E18\u0E4C\u0E43\u0E19\u0E20\u0E32\u0E22\u0E2B\u0E25\u0E31\u0E07\u3002
+message_error_code_system006=\u0E02\u0E2D\u0E2B\u0E21\u0E14\u0E40\u0E27\u0E25\u0E32\u0E42\u0E1B\u0E23\u0E14\u0E25\u0E2D\u0E07\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07\u0E43\u0E19\u0E20\u0E32\u0E22\u0E2B\u0E25\u0E31\u0E07
+message_error_code_system007=\u0E43\u0E19\u0E23\u0E30\u0E2B\u0E27\u0E48\u0E32\u0E07\u0E01\u0E32\u0E23\u0E1A\u0E33\u0E23\u0E38\u0E07\u0E23\u0E31\u0E01\u0E29\u0E32\u0E23\u0E30\u0E1A\u0E1A \u0E42\u0E1B\u0E23\u0E14\u0E25\u0E2D\u0E07\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07\u0E43\u0E19\u0E20\u0E32\u0E22\u0E2B\u0E25\u0E31\u0E07
+message_error_code_system008=\u0E23\u0E30\u0E1A\u0E1A\u0E1C\u0E34\u0E14\u0E1B\u0E01\u0E15\u0E34 \u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A
+message_error_code_system009=\u0E1A\u0E23\u0E34\u0E01\u0E32\u0E23\u0E23\u0E31\u0E1A\u0E23\u0E2D\u0E07\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E15\u0E49\u0E2D\u0E07
+message_error_code_system010=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49
+message_error_code_system011=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E2B\u0E23\u0E37\u0E2D\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E15\u0E49\u0E2D\u0E07
+message_error_code_system012=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E16\u0E39\u0E01\u0E25\u0E47\u0E2D\u0E04
+message_error_code_system013=\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27
+message_error_code_system014=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E16\u0E39\u0E01\u0E1B\u0E34\u0E14\u0E43\u0E0A\u0E49\u0E07\u0E32\u0E19
+message_error_code_system015=\u0E21\u0E35\u0E01\u0E32\u0E23\u0E22\u0E37\u0E48\u0E19\u0E02\u0E2D\u0E1C\u0E34\u0E14\u0E19\u0E31\u0E14\u0E17\u0E35\u0E48\u0E22\u0E31\u0E07\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E40\u0E23\u0E34\u0E48\u0E21\u0E15\u0E49\u0E19\u0E0B\u0E49\u0E33\u0E44\u0E14\u0E49
+message_error_code_system016=\u0E02\u0E31\u0E49\u0E19\u0E15\u0E2D\u0E19\u0E01\u0E32\u0E23\u0E43\u0E0A\u0E49\u0E2A\u0E34\u0E17\u0E18\u0E34\u0E21\u0E35\u0E01\u0E32\u0E23\u0E40\u0E1B\u0E25\u0E35\u0E48\u0E22\u0E19\u0E41\u0E1B\u0E25\u0E07\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E02\u0E2D\u0E02\u0E22\u0E32\u0E22\u0E40\u0E27\u0E25\u0E32\u0E44\u0E14\u0E49
+message_error_code_system017=\u0E15\u0E25\u0E32\u0E14\u0E42\u0E2D\u0E19\u0E40\u0E07\u0E34\u0E19\u0E21\u0E31\u0E14\u0E08\u0E33 \u0E42\u0E1B\u0E23\u0E14\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E1C\u0E39\u0E49\u0E2D\u0E2D\u0E01\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32\u3010{0}\u3011
+message_error_code_system018=\u0E42\u0E1B\u0E23\u0E14\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E40\u0E21\u0E37\u0E48\u0E2D\u0E01\u0E32\u0E23\u0E1B\u0E23\u0E30\u0E21\u0E27\u0E25\u0E1C\u0E25\u0E2A\u0E34\u0E49\u0E19\u0E2A\u0E38\u0E14\u0E27\u0E31\u0E19\u0E17\u0E35\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
+
+login_error_code_001=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E2B\u0E23\u0E37\u0E2D\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E15\u0E49\u0E2D\u0E07
+login_error_code_002=\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E40\u0E02\u0E49\u0E32\u0E16\u0E36\u0E07\u0E44\u0E14\u0E49\u0E42\u0E14\u0E22\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E2D\u0E19\u0E38\u0E0D\u0E32\u0E15! \u0E01\u0E23\u0E38\u0E13\u0E32\u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E08\u0E31\u0E14\u0E01\u0E32\u0E23!
+login_error_code_003=\u0E25\u0E47\u0E2D\u0E01\u0E2D\u0E34\u0E19!
+login_error_code_004=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E16\u0E39\u0E01\u0E1B\u0E34\u0E14\u0E43\u0E0A\u0E49\u0E07\u0E32\u0E19\u0E42\u0E1B\u0E23\u0E14\u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A
+login_error_code_005=\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E25\u0E47\u0E2D\u0E01\u0E2D\u0E34\u0E19\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+login_error_code_006=\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E23\u0E32\u0E22\u0E19\u0E35\u0E49\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E08\u0E23\u0E34\u0E07\u0E42\u0E1B\u0E23\u0E14\u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E08\u0E31\u0E14\u0E01\u0E32\u0E23
+login_error_code_007=\u0E44\u0E21\u0E48\u0E2D\u0E19\u0E38\u0E0D\u0E32\u0E15\u0E43\u0E2B\u0E49\u0E1B\u0E34\u0E14\u0E01\u0E32\u0E23\u0E43\u0E0A\u0E49\u0E07\u0E32\u0E19\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E17\u0E35\u0E48\u0E25\u0E47\u0E2D\u0E01\u0E2D\u0E34\u0E19\u0E1B\u0E31\u0E08\u0E08\u0E38\u0E1A\u0E31\u0E19
+login_error_code_008=\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E43\u0E0A\u0E49\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E40\u0E14\u0E34\u0E21\u0E44\u0E14\u0E49
+login_error_code_009=\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E40\u0E01\u0E48\u0E32\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14
+login_error_code_010=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E15\u0E31\u0E27\u0E25\u0E30\u0E04\u0E23\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14
+
+role_error_code_001=\u0E0A\u0E37\u0E48\u0E2D\u0E15\u0E31\u0E27\u0E25\u0E30\u0E04\u0E23\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+
+market_run_message_001=\u0E1A\u0E31\u0E07\u0E04\u0E31\u0E1A\u0E43\u0E2B\u0E49\u0E2D\u0E2D\u0E1F\u0E44\u0E25\u0E19\u0E4C\u0E16\u0E39\u0E01\u0E2A\u0E48\u0E07\u0E41\u0E25\u0E49\u0E27
+
+organ_error_code_001=\u0E1A\u0E17\u0E1A\u0E32\u0E17\u0E17\u0E35\u0E48\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E21\u0E2D\u0E1A\u0E2B\u0E21\u0E32\u0E22\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01\u0E23\u0E30\u0E1A\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_002=\u0E21\u0E35\u0E2B\u0E19\u0E48\u0E27\u0E22\u0E07\u0E32\u0E19\u0E23\u0E30\u0E14\u0E31\u0E1A\u0E25\u0E48\u0E32\u0E07\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01\u0E23\u0E30\u0E1A\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_003=\u0E21\u0E35\u0E19\u0E31\u0E01\u0E25\u0E07\u0E17\u0E38\u0E19\u0E23\u0E30\u0E14\u0E31\u0E1A\u0E25\u0E48\u0E32\u0E07\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01\u0E23\u0E30\u0E1A\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_004=\u0E21\u0E35\u0E40\u0E07\u0E34\u0E19\u0E40\u0E2B\u0E25\u0E37\u0E2D\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01\u0E23\u0E30\u0E1A\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_005=\u0E21\u0E35\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E17\u0E35\u0E48\u0E40\u0E2B\u0E25\u0E37\u0E2D\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01\u0E23\u0E30\u0E1A\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_006=\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E40\u0E2D\u0E01\u0E2A\u0E32\u0E23\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E01\u0E32\u0E23\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01\u0E15\u0E32\u0E21\u0E1B\u0E01\u0E15\u0E34\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E01\u0E39\u0E49\u0E04\u0E37\u0E19\u0E44\u0E14\u0E49
+organ_error_code_007=\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E42\u0E17\u0E23\u0E28\u0E31\u0E1E\u0E17\u0E4C\u0E21\u0E37\u0E2D\u0E16\u0E37\u0E2D\u0E21\u0E35\u0E01\u0E32\u0E23\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01\u0E1B\u0E01\u0E15\u0E34\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E01\u0E39\u0E49\u0E04\u0E37\u0E19\u0E44\u0E14\u0E49
+organ_error_code_008=\u0E2B\u0E19\u0E48\u0E27\u0E22\u0E07\u0E32\u0E19\u0E17\u0E35\u0E48\u0E40\u0E2B\u0E19\u0E37\u0E2D\u0E01\u0E27\u0E48\u0E32\u0E2D\u0E22\u0E39\u0E48\u0E43\u0E19\u0E2A\u0E20\u0E32\u0E1E\u0E17\u0E35\u0E48\u0E44\u0E21\u0E48\u0E1B\u0E01\u0E15\u0E34\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E01\u0E39\u0E49\u0E04\u0E37\u0E19\u0E44\u0E14\u0E49
+organ_error_code_009=\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\u0E17\u0E35\u0E48\u0E2A\u0E31\u0E07\u0E01\u0E31\u0E14\u0E44\u0E21\u0E48\u0E21\u0E35\u0E1A\u0E17\u0E1A\u0E32\u0E17\u0E40\u0E1B\u0E47\u0E19\u0E19\u0E32\u0E22\u0E2B\u0E19\u0E49\u0E32\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E01\u0E39\u0E49\u0E04\u0E37\u0E19\u0E44\u0E14\u0E49
+organ_error_code_010=\u0E23\u0E2B\u0E31\u0E2A\u0E2B\u0E23\u0E37\u0E2D\u0E23\u0E2B\u0E31\u0E2A\u0E2A\u0E16\u0E32\u0E1A\u0E31\u0E19\u0E0B\u0E49\u0E33
+organ_error_code_011=\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E40\u0E2D\u0E01\u0E2A\u0E32\u0E23\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+organ_error_code_012=\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E40\u0E2D\u0E01\u0E2A\u0E32\u0E23\u0E2D\u0E22\u0E39\u0E48\u0E43\u0E19\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E14\u0E33\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E40\u0E1B\u0E34\u0E14\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E44\u0E14\u0E49
+organ_error_code_013=\u0E21\u0E35\u0E0A\u0E37\u0E48\u0E2D\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+organ_error_code_014=\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A \u0E40\u0E02\u0E49\u0E32\u0E2A\u0E39\u0E48\u0E23\u0E30\u0E1A\u0E1A \u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E1A\u0E31\u0E0D\u0E0A\u0E35 \u0E17\u0E33\u0E0B\u0E49\u0E33
+organ_error_code_015=\u0E40\u0E1E\u0E34\u0E48\u0E21\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27 \u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A
+organ_error_code_016=\u0E21\u0E35\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E42\u0E17\u0E23\u0E28\u0E31\u0E1E\u0E17\u0E4C\u0E21\u0E37\u0E2D\u0E16\u0E37\u0E2D\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+organ_error_code_017=\u0E0A\u0E37\u0E48\u0E2D\u0E18\u0E38\u0E23\u0E01\u0E34\u0E08\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+organ_error_code_018=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E02\u0E2D\u0E07\u0E2B\u0E19\u0E48\u0E27\u0E22\u0E07\u0E32\u0E19\u0E21\u0E35\u0E01\u0E32\u0E23\u0E40\u0E1B\u0E25\u0E35\u0E48\u0E22\u0E19\u0E41\u0E1B\u0E25\u0E07 \u0E01\u0E23\u0E38\u0E13\u0E32\u0E23\u0E35\u0E40\u0E1F\u0E23\u0E0A\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25
+organ_error_code_019=\u0E21\u0E35\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E40\u0E2D\u0E01\u0E2A\u0E32\u0E23\u0E2B\u0E23\u0E37\u0E2D\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E42\u0E17\u0E23\u0E28\u0E31\u0E1E\u0E17\u0E4C\u0E21\u0E37\u0E2D\u0E16\u0E37\u0E2D\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+organ_error_code_020=\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E1B\u0E0F\u0E34\u0E40\u0E2A\u0E18\u0E40\u0E2B\u0E15\u0E38\u0E1C\u0E25 \u0E44\u0E21\u0E48\u0E40\u0E01\u0E34\u0E19 80 \u0E04\u0E33
+organ_error_code_021=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E19\u0E31\u0E01\u0E25\u0E07\u0E17\u0E38\u0E19\u0E21\u0E35\u0E01\u0E32\u0E23\u0E40\u0E1B\u0E25\u0E35\u0E48\u0E22\u0E19\u0E41\u0E1B\u0E25\u0E07\u0E42\u0E1B\u0E23\u0E14\u0E23\u0E35\u0E40\u0E1F\u0E23\u0E0A\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25
+organ_error_code_022=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E23\u0E2D\u0E01\u0E32\u0E23\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E16\u0E2D\u0E19\u0E44\u0E14\u0E49
+organ_error_code_023=\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\u0E17\u0E35\u0E48\u0E2A\u0E31\u0E07\u0E01\u0E31\u0E14\u0E2D\u0E22\u0E39\u0E48\u0E43\u0E19\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E44\u0E21\u0E48\u0E1B\u0E01\u0E15\u0E34\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E1C\u0E48\u0E32\u0E19
+organ_error_code_024=\u0E2B\u0E19\u0E48\u0E27\u0E22\u0E07\u0E32\u0E19\u0E17\u0E35\u0E48\u0E2A\u0E31\u0E07\u0E01\u0E31\u0E14\u0E2D\u0E22\u0E39\u0E48\u0E43\u0E19\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E44\u0E21\u0E48\u0E1B\u0E01\u0E15\u0E34\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E1C\u0E48\u0E32\u0E19
+organ_error_code_025=\u0E42\u0E1A\u0E23\u0E01\u0E40\u0E01\u0E2D\u0E23\u0E4C\u0E17\u0E35\u0E48\u0E2D\u0E22\u0E39\u0E48\u0E43\u0E19\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E44\u0E21\u0E48\u0E1B\u0E01\u0E15\u0E34\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E44\u0E14\u0E49 \u0E1C\u0E48\u0E32\u0E19
+organ_error_code_026=\u0E21\u0E35\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\u0E40\u0E1B\u0E47\u0E19\u0E19\u0E32\u0E22\u0E2B\u0E19\u0E49\u0E32\u0E0B\u0E37\u0E49\u0E2D\u0E02\u0E32\u0E22\u0E2B\u0E25\u0E31\u0E01\u0E17\u0E23\u0E31\u0E1E\u0E22\u0E4C\u0E23\u0E30\u0E14\u0E31\u0E1A\u0E25\u0E48\u0E32\u0E07\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_027=\u0E21\u0E35\u0E04\u0E25\u0E31\u0E07\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32\u0E23\u0E30\u0E14\u0E31\u0E1A\u0E25\u0E48\u0E32\u0E07\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E2D\u0E2D\u0E01\u0E44\u0E14\u0E49
+organ_error_code_028=\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E2A\u0E20\u0E32\u0E1E\u0E04\u0E25\u0E48\u0E2D\u0E07\u0E44\u0E14\u0E49\u0E25\u0E07\u0E19\u0E32\u0E21\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_029=\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E2A\u0E20\u0E32\u0E1E\u0E04\u0E25\u0E48\u0E2D\u0E07\u0E40\u0E1B\u0E47\u0E19\u0E1C\u0E39\u0E49\u0E2D\u0E49\u0E32\u0E07\u0E2D\u0E34\u0E07\u0E40\u0E23\u0E34\u0E48\u0E21\u0E15\u0E49\u0E19\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_030=\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E2A\u0E20\u0E32\u0E1E\u0E04\u0E25\u0E48\u0E2D\u0E07\u0E44\u0E14\u0E49\u0E01\u0E33\u0E2B\u0E19\u0E14\u0E04\u0E48\u0E32\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E31\u0E21\u0E1E\u0E31\u0E19\u0E18\u0E4C\u0E02\u0E2D\u0E07\u0E04\u0E39\u0E48\u0E41\u0E02\u0E48\u0E07\u0E23\u0E30\u0E14\u0E31\u0E1A\u0E17\u0E35\u0E48\u0E2A\u0E2D\u0E07\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_031=\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01 Marketmaker \u0E16\u0E39\u0E01\u0E2D\u0E49\u0E32\u0E07\u0E2D\u0E34\u0E07\u0E42\u0E14\u0E22 OTC Options Marketmaker \u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_032=\u0E21\u0E35\u0E1B\u0E23\u0E30\u0E40\u0E20\u0E17\u0E02\u0E2D\u0E07\u0E04\u0E30\u0E41\u0E19\u0E19\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E2D\u0E2D\u0E01\u0E44\u0E14\u0E49
+organ_error_code_033=\u0E2D\u0E49\u0E32\u0E07\u0E2A\u0E16\u0E32\u0E1A\u0E31\u0E19\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E25\u0E1A\u0E44\u0E14\u0E49
+organ_error_code_034=\u0E1C\u0E39\u0E49\u0E1A\u0E31\u0E07\u0E04\u0E31\u0E1A\u0E1A\u0E31\u0E0D\u0E0A\u0E32\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E17\u0E33\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E15\u0E19\u0E40\u0E2D\u0E07\u0E44\u0E14\u0E49
+organ_error_code_035=\u0E04\u0E48\u0E32\u0E2D\u0E31\u0E15\u0E23\u0E32\u0E2A\u0E48\u0E27\u0E19\u0E15\u0E49\u0E2D\u0E07\u0E44\u0E21\u0E48\u0E40\u0E01\u0E34\u0E19 100
+
+
+profit_shar_error_code_001=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E25\u0E1A\u0E01\u0E32\u0E23\u0E01\u0E33\u0E2B\u0E19\u0E14\u0E04\u0E48\u0E32\u0E01\u0E32\u0E23\u0E41\u0E1A\u0E48\u0E07\u0E07\u0E32\u0E19\u0E01\u0E48\u0E2D\u0E19
+profit_shar_error_code_002=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E25\u0E1A\u0E04\u0E19\u0E01\u0E25\u0E38\u0E48\u0E21\u0E2D\u0E2D\u0E01\u0E01\u0E48\u0E2D\u0E19
+profit_shar_error_code_003=\u0E21\u0E35\u0E01\u0E32\u0E23\u0E01\u0E33\u0E2B\u0E19\u0E14\u0E04\u0E48\u0E32\u0E01\u0E32\u0E23\u0E41\u0E1A\u0E48\u0E07\u0E1B\u0E23\u0E30\u0E40\u0E20\u0E17\u0E02\u0E2D\u0E07\u0E04\u0E48\u0E32\u0E18\u0E23\u0E23\u0E21\u0E40\u0E19\u0E35\u0E22\u0E21\u0E19\u0E35\u0E49\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+
+query_error_code_001=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E2A\u0E2D\u0E1A\u0E16\u0E32\u0E21\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E15\u0E25\u0E32\u0E14
+query_error_code_002=\u0E2A\u0E2D\u0E1A\u0E16\u0E32\u0E21\u0E1B\u0E23\u0E30\u0E27\u0E31\u0E15\u0E34 \u0E01\u0E23\u0E38\u0E13\u0E32\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E27\u0E31\u0E19\u0E17\u0E35\u0E48\u0E40\u0E23\u0E34\u0E48\u0E21\u0E15\u0E49\u0E19
+query_error_code_003=\u0E2A\u0E2D\u0E1A\u0E16\u0E32\u0E21\u0E1B\u0E23\u0E30\u0E27\u0E31\u0E15\u0E34 \u0E01\u0E23\u0E38\u0E13\u0E32\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E27\u0E31\u0E19\u0E2A\u0E34\u0E49\u0E19\u0E2A\u0E38\u0E14
+query_error_code_004=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2A\u0E34\u0E17\u0E18\u0E34\u0E4C\u0E19\u0E35\u0E49
+query_error_code_005=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E17\u0E35\u0E48\u0E08\u0E30\u0E2A\u0E48\u0E07\u0E2D\u0E2D\u0E01
+query_error_code_006=\u0E2A\u0E48\u0E07\u0E2D\u0E2D\u0E01\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27, \u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A!
+query_error_code_007=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E01\u0E23\u0E2D\u0E01\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E40\u0E07\u0E34\u0E19\u0E17\u0E38\u0E19
+query_error_code_008=\u0E02\u0E49\u0E2D\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14\u0E02\u0E2D\u0E07\u0E15\u0E25\u0E32\u0E14\u0E2B\u0E23\u0E37\u0E2D\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E44\u0E21\u0E48\u0E40\u0E1B\u0E34\u0E14\u0E15\u0E25\u0E32\u0E14
+query_error_code_009=\u0E1E\u0E32\u0E23\u0E32\u0E21\u0E34\u0E40\u0E15\u0E2D\u0E23\u0E4C\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14
+query_error_code_010=\u0E41\u0E1F\u0E49\u0E21\u0E19\u0E33\u0E40\u0E02\u0E49\u0E32\u0E27\u0E48\u0E32\u0E07\u0E40\u0E1B\u0E25\u0E48\u0E32
+
+report_error_code_001=\u0E27\u0E31\u0E19\u0E40\u0E23\u0E34\u0E48\u0E21\u0E15\u0E49\u0E19\u0E01\u0E32\u0E23\u0E0B\u0E37\u0E49\u0E2D\u0E02\u0E32\u0E22{0},\u0E2A\u0E34\u0E49\u0E19\u0E2A\u0E38\u0E14\u0E27\u0E31\u0E19\u0E0B\u0E37\u0E49\u0E2D\u0E02\u0E32\u0E22 {1} \u0E40\u0E01\u0E34\u0E14\u0E02\u0E49\u0E2D\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14\u0E43\u0E19\u0E01\u0E32\u0E23\u0E19\u0E31\u0E1A\u0E23\u0E32\u0E22\u0E07\u0E32\u0E19\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07
+
+settlement_message_001=\u0E22\u0E37\u0E19\u0E22\u0E31\u0E19\u0E01\u0E32\u0E23\u0E0A\u0E33\u0E23\u0E30\u0E40\u0E07\u0E34\u0E19\u0E40\u0E2A\u0E23\u0E47\u0E08\u0E2A\u0E34\u0E49\u0E19: {0} \u0E04\u0E27\u0E32\u0E21\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E02\u0E2D\u0E07\u0E1A\u0E32\u0E23\u0E4C, {1} \u0E41\u0E16\u0E1A\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27
+settlement_message_002=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E21\u0E35\u0E01\u0E32\u0E23\u0E40\u0E1B\u0E25\u0E35\u0E48\u0E22\u0E19\u0E41\u0E1B\u0E25\u0E07\u0E42\u0E1B\u0E23\u0E14\u0E23\u0E35\u0E40\u0E1F\u0E23\u0E0A\u0E25\u0E2D\u0E07\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07
+
+pwd_error_code_001=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E01\u0E23\u0E2D\u0E01\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E40\u0E01\u0E48\u0E32
+pwd_error_code_002=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E01\u0E23\u0E2D\u0E01\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E43\u0E2B\u0E21\u0E48
+pwd_error_code_003=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E01\u0E23\u0E2D\u0E01\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E43\u0E2B\u0E21\u0E48\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E22\u0E37\u0E19\u0E22\u0E31\u0E19
+pwd_error_code_004=\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E44\u0E21\u0E48\u0E2A\u0E2D\u0E14\u0E04\u0E25\u0E49\u0E2D\u0E07\u0E01\u0E31\u0E19\u0E2A\u0E2D\u0E07\u0E04\u0E23\u0E31\u0E49\u0E07
+pwd_error_code_005=\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E40\u0E01\u0E48\u0E32\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14
+
+amount_error_code_001=\u0E08\u0E33\u0E19\u0E27\u0E19\u0E40\u0E07\u0E34\u0E19\u0E40\u0E1B\u0E47\u0E19 0 \u0E44\u0E21\u0E48\u0E21\u0E35\u0E01\u0E32\u0E23\u0E1B\u0E23\u0E30\u0E21\u0E27\u0E25\u0E1C\u0E25!
+
+traAcc_error_code_001=\u0E40\u0E02\u0E49\u0E32\u0E2A\u0E39\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E0B\u0E49\u0E33, \u0E01\u0E23\u0E38\u0E13\u0E32\u0E41\u0E15\u0E30 Resurve \u0E41\u0E25\u0E30\u0E2A\u0E48\u0E07\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07!
+
+investor_error_code_001=\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E40\u0E07\u0E34\u0E19
+investor_error_code_002=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E17\u0E35\u0E48\u0E44\u0E21\u0E48\u0E43\u0E0A\u0E48\u0E19\u0E31\u0E01\u0E25\u0E07\u0E17\u0E38\u0E19\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E44\u0E14\u0E49\u0E42\u0E14\u0E22\u0E1C\u0E39\u0E49\u0E02\u0E32\u0E22
+investor_error_code_003=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E40\u0E07\u0E34\u0E19\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E22\u0E01\u0E40\u0E25\u0E34\u0E01 \u0E02\u0E32\u0E22\u0E44\u0E21\u0E48\u0E2D\u0E2D\u0E01
+investor_error_code_004=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E21\u0E35\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E17\u0E35\u0E48\u0E40\u0E01\u0E35\u0E48\u0E22\u0E27\u0E02\u0E49\u0E2D\u0E07 \u0E40\u0E0A\u0E48\u0E19 \u0E40\u0E07\u0E34\u0E19\u0E17\u0E38\u0E19 \u0E01\u0E32\u0E23\u0E40\u0E1B\u0E34\u0E14\u0E42\u0E1E\u0E0B\u0E34\u0E0A\u0E31\u0E48\u0E19 \u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01\u0E23\u0E30\u0E1A\u0E1A\u0E44\u0E14\u0E49
+investor_error_code_005=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E01\u0E32\u0E23\u0E15\u0E2D\u0E1A\u0E2A\u0E19\u0E2D\u0E07\u0E15\u0E48\u0E2D\u0E01\u0E32\u0E23\u0E23\u0E49\u0E2D\u0E07\u0E02\u0E2D\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E40\u0E07\u0E34\u0E19\u0E17\u0E38\u0E19.
+investor_error_code_006=\u0E0A\u0E37\u0E48\u0E2D\u0E01\u0E25\u0E38\u0E48\u0E21\u0E0B\u0E49\u0E33.
+investor_error_code_007=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E19\u0E31\u0E01\u0E25\u0E07\u0E17\u0E38\u0E19.
+investor_error_code_008={0}\u0E01\u0E32\u0E23\u0E08\u0E31\u0E14\u0E01\u0E25\u0E38\u0E48\u0E21\u0E17\u0E35\u0E48\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E21\u0E2D\u0E1A\u0E2B\u0E21\u0E32\u0E22.
+investor_error_code_009=\u0E42\u0E1B\u0E23\u0E14\u0E25\u0E1A\u0E19\u0E31\u0E01\u0E25\u0E07\u0E17\u0E38\u0E19\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14\u0E20\u0E32\u0E22\u0E43\u0E15\u0E49\u0E01\u0E25\u0E38\u0E48\u0E21\u0E19\u0E35\u0E49\u0E01\u0E48\u0E2D\u0E19.
+investor_error_code_010=\u0E42\u0E1B\u0E23\u0E14\u0E25\u0E1A\u0E01\u0E32\u0E23\u0E15\u0E31\u0E49\u0E07\u0E04\u0E48\u0E32\u0E2A\u0E48\u0E27\u0E19\u0E1A\u0E38\u0E04\u0E04\u0E25\u0E02\u0E2D\u0E07\u0E01\u0E25\u0E38\u0E48\u0E21\u0E19\u0E31\u0E49\u0E19\u0E01\u0E48\u0E2D\u0E19.
+investor_error_code_011=\u0E04\u0E48\u0E32\u0E2D\u0E31\u0E15\u0E23\u0E32\u0E2A\u0E48\u0E27\u0E19\u0E15\u0E49\u0E2D\u0E07\u0E44\u0E21\u0E48\u0E40\u0E01\u0E34\u0E19 10,000
+
+warehouse_error_code_01=\u0E23\u0E2B\u0E31\u0E2A\u0E04\u0E25\u0E31\u0E07\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32 \u0E2A\u0E39\u0E07\u0E2A\u0E38\u0E14 10 \u0E2B\u0E25\u0E31\u0E01
+warehouse_error_code_02=\u0E23\u0E2B\u0E31\u0E2A\u0E04\u0E25\u0E31\u0E07\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32\u0E0B\u0E49\u0E33
+warehouse_error_code_03=\u0E0A\u0E37\u0E48\u0E2D\u0E04\u0E25\u0E31\u0E07\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32\u0E0B\u0E49\u0E33\u0E01\u0E31\u0E19
+warehouse_error_code_04=\u0E02\u0E49\u0E2D\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14\u0E02\u0E2D\u0E07\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25: \u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E2A\u0E16\u0E32\u0E1A\u0E31\u0E19\u0E2B\u0E32\u0E22\u0E44\u0E1B
+warehouse_error_code_05=\u0E04\u0E25\u0E31\u0E07\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32\u0E19\u0E35\u0E49\u0E21\u0E35\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E31\u0E21\u0E1E\u0E31\u0E19\u0E18\u0E4C\u0E01\u0E31\u0E1A\u0E1E\u0E31\u0E19\u0E18\u0E38\u0E4C\u0E2A\u0E1B\u0E2D\u0E15\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E2D\u0E2D\u0E01\u0E08\u0E32\u0E01\u0E23\u0E30\u0E1A\u0E1A\u0E44\u0E14\u0E49
+
+message_notice_error_code_01=\u0E01\u0E23\u0E38\u0E13\u0E32\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\u0E2D\u0E22\u0E48\u0E32\u0E07\u0E19\u0E49\u0E2D\u0E22\u0E2B\u0E19\u0E36\u0E48\u0E07\u0E04\u0E19\uFF01
+message_notice_error_code_02=\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01\uFF01\uFF01\uFF01

+ 151 - 145
mtp3-century/src/main/resources/message_zh-cn.properties

@@ -1,145 +1,151 @@
-message_code_system001=操作成功
-message_code_system003=修改成功
-message_code_system004=签约成功
-message_code_system005=解约成功
-message_code_system006=获取验证码成功
-message_code_system007=登录成功
-message_code_system008=出金成功
-message_code_system009=入金成功
-message_code_system010=用户认证通过
-message_code_system011=斩仓恢复操作成功
-message_code_system012=支付货款成功
-message_code_system013=预售摇号成功
-message_code_system014=预售完成成功
-message_code_system015=预售申请成功
-message_code_system016=履约确认信息已发送并处理中,稍后请重新查询
-message_code_system017=申请成功
-message_code_system018=履约联络信息已发送,稍后请重新查询
-message_code_system019=执行成功
-message_code_system020=批量导入持仓过户成功
-message_code_system021=提交成功,闭市后自动进行转移
-message_code_system022=该数据已经审核完成或处理中
-message_code_system023=没有找到交易商资金账户
-message_code_system024=审核拒绝
-message_code_system025=非交易商账户,不能销户审核
-message_code_system026=资金账户未解约,不能销户
-message_code_system027=还剩{0}次错误机会,账号或密码不匹配达到{1}次,登录账号将锁定{2}分钟{3}
-
-message_error_code_system001=令牌失效,请重新登录!
-message_error_code_system002=操作失败
-message_error_code_system003=没有该用户的操作权限!
-message_error_code_system004=文件上传失败,请联系管理人员处理!
-message_error_code_system005=您的申请已提交,请稍后查询结果。
-message_error_code_system006=请求超时,请稍后重试
-message_error_code_system007=系统维护中,请稍后再试
-message_error_code_system008=系统异常,请联系管理员
-message_error_code_system009=认证服务不正常
-message_error_code_system010=用户账户不存在
-message_error_code_system011=账户或密码错误
-message_error_code_system012=用户账户已被锁
-message_error_code_system013=用户密码已失效
-message_error_code_system014=用户账户已禁用
-message_error_code_system015=存在未处理的违约申请,不能重复发起
-message_error_code_system016=履约计划步骤已发生变更,无法申请延期
-message_error_code_system017=定金转让市场,请选择商品发行方【{0}】
-message_error_code_system018=请于系统日终处理成功时执行
-
-login_error_code_001=账户或密码错误
-login_error_code_002=未经允许,不可访问!请联系管理员处理!
-login_error_code_003=登录锁定!
-login_error_code_004=账户已停用,请联系管理员
-login_error_code_005=登录账号已存在
-login_error_code_006=该用户不存在,请联系管理人员处理
-login_error_code_007=不允许停用当前登录账户
-login_error_code_008=不能与旧密码相同
-login_error_code_009=旧密码错误
-login_error_code_010=角色信息有误
-
-role_error_code_001=角色名已存在
-
-market_run_message_001=强制下线已发送
-
-organ_error_code_001=已分配角色,无法注销
-organ_error_code_002=存在下级机构,无法注销
-organ_error_code_003=存在下级投资者,无法注销
-organ_error_code_004=有剩余资金,无法注销
-organ_error_code_005=有剩余持仓,无法注销
-organ_error_code_006=证件号码已存在正常记录,无法恢复
-organ_error_code_007=手机号已存在正常记录,无法恢复
-organ_error_code_008=上级机构为非正常状态,无法恢复
-organ_error_code_009=所属会员没有经纪角色,无法恢复
-organ_error_code_010=代码或机构代码重复
-organ_error_code_011=证件号码已存在
-organ_error_code_012=证件号码已存在黑名单中,不能开户
-organ_error_code_013=名称已存在
-organ_error_code_014=管理员登录帐号重复
-organ_error_code_015=新增失败,请联系管理员
-organ_error_code_016=手机号已存在
-organ_error_code_017=企业名称已存在
-organ_error_code_018=该机构信息已变更,请刷新数据
-organ_error_code_019=证件号码或手机号已存在
-organ_error_code_020=审核拒绝原因不能超过80个字
-organ_error_code_021=该投资者信息已变更,请刷新数据
-organ_error_code_022=非待审核状态,无法撤回
-organ_error_code_023=所属会员为非正常状态,无法审核通过
-organ_error_code_024=所属机构为非正常状态,无法审核通过
-organ_error_code_025=所属经纪人为非正常状态,无法审核通过
-organ_error_code_026=存在下级经纪会员,无法删除
-organ_error_code_027=存在下级仓库,无法删除
-organ_error_code_028=做市会员已签约,无法删除
-organ_error_code_029=做市会员是默认报价商,无法删除
-organ_error_code_030=做市会员已配置二级对手关系,无法删除
-organ_error_code_031=做市会员被场外期权做市引用,无法删除
-organ_error_code_032=存在积分类型,无法删除
-organ_error_code_033=报价机构被引用,无法删除
-organ_error_code_034=上级不能为自己
-organ_error_code_035=比率值不能大于100
-
-
-profit_shar_error_code_001=请先删除分润配置
-profit_shar_error_code_002=请先删除分组人员
-profit_shar_error_code_003=该费用类型已存在分润配置
-
-query_error_code_001=请选择市场查询
-query_error_code_002=历史查询请选择开始日期
-query_error_code_003=历史查询请选择结束日期
-query_error_code_004=没有此权限
-query_error_code_005=无数据可导出
-query_error_code_006=导出失败,请联系管理员!
-query_error_code_007=请输入资金账户
-query_error_code_008=市场错误或状态不为开市状态
-query_error_code_009=参数错误
-query_error_code_010=导入文件为空
-
-report_error_code_001=起始交易日{0},结束交易日{1}执行报表重新统计出错
-
-settlement_message_001=确认付款完成: {0} 条成功, {1} 条失败
-settlement_message_002=数据有变更,请刷新重试
-
-pwd_error_code_001=请填写旧密码
-pwd_error_code_002=请填写新密码
-pwd_error_code_003=请填写新密码确认
-pwd_error_code_004=两次密码不一致
-pwd_error_code_005=旧密码错误
-
-amount_error_code_001=金额为 0,不做处理!
-
-traAcc_error_code_001=登录账户重复,请点击重新生存并再次提交!
-
-investor_error_code_001=没有找到资金账户
-investor_error_code_002=非投资者账户,不能销户审核.
-investor_error_code_003=资金账户未解约,不能销户.
-investor_error_code_004=账户存在资金、持仓等相关信息,不能注销.
-investor_error_code_005=资金账户请求没有回应.
-investor_error_code_006=分组名重复.
-investor_error_code_007=请选择投资者.
-investor_error_code_008={0}已分配分组.
-investor_error_code_009=请先移除该分组下所有投资者.
-investor_error_code_010=请先删除该分组的个性化设置.
-investor_error_code_011=比率值不能大于10000
-
-warehouse_error_code_01=仓库代码最多10位
-warehouse_error_code_02=仓库代码重复
-warehouse_error_code_03=仓库名称重复
-warehouse_error_code_04=数据错误:机构数据缺失
-warehouse_error_code_05=该仓库已关联现货品种,不能注销
+message_code_system001=\u64CD\u4F5C\u6210\u529F
+message_code_system003=\u4FEE\u6539\u6210\u529F
+message_code_system004=\u7B7E\u7EA6\u6210\u529F
+message_code_system005=\u89E3\u7EA6\u6210\u529F
+message_code_system006=\u83B7\u53D6\u9A8C\u8BC1\u7801\u6210\u529F
+message_code_system007=\u767B\u5F55\u6210\u529F
+message_code_system008=\u51FA\u91D1\u6210\u529F
+message_code_system009=\u5165\u91D1\u6210\u529F
+message_code_system010=\u7528\u6237\u8BA4\u8BC1\u901A\u8FC7
+message_code_system011=\u65A9\u4ED3\u6062\u590D\u64CD\u4F5C\u6210\u529F
+message_code_system012=\u652F\u4ED8\u8D27\u6B3E\u6210\u529F
+message_code_system013=\u9884\u552E\u6447\u53F7\u6210\u529F
+message_code_system014=\u9884\u552E\u5B8C\u6210\u6210\u529F
+message_code_system015=\u9884\u552E\u7533\u8BF7\u6210\u529F
+message_code_system016=\u5C65\u7EA6\u786E\u8BA4\u4FE1\u606F\u5DF2\u53D1\u9001\u5E76\u5904\u7406\u4E2D,\u7A0D\u540E\u8BF7\u91CD\u65B0\u67E5\u8BE2
+message_code_system017=\u7533\u8BF7\u6210\u529F
+message_code_system018=\u5C65\u7EA6\u8054\u7EDC\u4FE1\u606F\u5DF2\u53D1\u9001,\u7A0D\u540E\u8BF7\u91CD\u65B0\u67E5\u8BE2
+message_code_system019=\u6267\u884C\u6210\u529F
+message_code_system020=\u6279\u91CF\u5BFC\u5165\u6301\u4ED3\u8FC7\u6237\u6210\u529F
+message_code_system021=\u63D0\u4EA4\u6210\u529F,\u95ED\u5E02\u540E\u81EA\u52A8\u8FDB\u884C\u8F6C\u79FB
+message_code_system022=\u8BE5\u6570\u636E\u5DF2\u7ECF\u5BA1\u6838\u5B8C\u6210\u6216\u5904\u7406\u4E2D
+message_code_system023=\u6CA1\u6709\u627E\u5230\u4EA4\u6613\u5546\u8D44\u91D1\u8D26\u6237
+message_code_system024=\u5BA1\u6838\u62D2\u7EDD
+message_code_system025=\u975E\u4EA4\u6613\u5546\u8D26\u6237,\u4E0D\u80FD\u9500\u6237\u5BA1\u6838
+message_code_system026=\u8D44\u91D1\u8D26\u6237\u672A\u89E3\u7EA6,\u4E0D\u80FD\u9500\u6237
+message_code_system027=\u8FD8\u5269{0}\u6B21\u9519\u8BEF\u673A\u4F1A,\u8D26\u53F7\u6216\u5BC6\u7801\u4E0D\u5339\u914D\u8FBE\u5230{1}\u6B21,\u767B\u5F55\u8D26\u53F7\u5C06\u9501\u5B9A{2}\u5206\u949F{3}
+message_code_system028=\u9ED1\u540D\u5355\u5DF2\u6709\u6B64\u8BC1\u4EF6!
+message_code_system029=IP\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A\u503C!
+message_code_system030=IP\u5730\u5740\u91CD\u590D!
+
+message_error_code_system001=\u4EE4\u724C\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\uFF01
+message_error_code_system002=\u64CD\u4F5C\u5931\u8D25
+message_error_code_system003=\u6CA1\u6709\u8BE5\u7528\u6237\u7684\u64CD\u4F5C\u6743\u9650!
+message_error_code_system004=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u4EBA\u5458\u5904\u7406\uFF01
+message_error_code_system005=\u60A8\u7684\u7533\u8BF7\u5DF2\u63D0\u4EA4\uFF0C\u8BF7\u7A0D\u540E\u67E5\u8BE2\u7ED3\u679C\u3002
+message_error_code_system006=\u8BF7\u6C42\u8D85\u65F6,\u8BF7\u7A0D\u540E\u91CD\u8BD5
+message_error_code_system007=\u7CFB\u7EDF\u7EF4\u62A4\u4E2D\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5
+message_error_code_system008=\u7CFB\u7EDF\u5F02\u5E38,\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+message_error_code_system009=\u8BA4\u8BC1\u670D\u52A1\u4E0D\u6B63\u5E38
+message_error_code_system010=\u7528\u6237\u8D26\u6237\u4E0D\u5B58\u5728
+message_error_code_system011=\u8D26\u6237\u6216\u5BC6\u7801\u9519\u8BEF
+message_error_code_system012=\u7528\u6237\u8D26\u6237\u5DF2\u88AB\u9501
+message_error_code_system013=\u7528\u6237\u5BC6\u7801\u5DF2\u5931\u6548
+message_error_code_system014=\u7528\u6237\u8D26\u6237\u5DF2\u7981\u7528
+message_error_code_system015=\u5B58\u5728\u672A\u5904\u7406\u7684\u8FDD\u7EA6\u7533\u8BF7\uFF0C\u4E0D\u80FD\u91CD\u590D\u53D1\u8D77
+message_error_code_system016=\u5C65\u7EA6\u8BA1\u5212\u6B65\u9AA4\u5DF2\u53D1\u751F\u53D8\u66F4,\u65E0\u6CD5\u7533\u8BF7\u5EF6\u671F
+message_error_code_system017=\u5B9A\u91D1\u8F6C\u8BA9\u5E02\u573A\uFF0C\u8BF7\u9009\u62E9\u5546\u54C1\u53D1\u884C\u65B9\u3010{0}\u3011
+message_error_code_system018=\u8BF7\u4E8E\u7CFB\u7EDF\u65E5\u7EC8\u5904\u7406\u6210\u529F\u65F6\u6267\u884C
+
+login_error_code_001=\u8D26\u6237\u6216\u5BC6\u7801\u9519\u8BEF
+login_error_code_002=\u672A\u7ECF\u5141\u8BB8\uFF0C\u4E0D\u53EF\u8BBF\u95EE\uFF01\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u5904\u7406\uFF01
+login_error_code_003=\u767B\u5F55\u9501\u5B9A\uFF01
+login_error_code_004=\u8D26\u6237\u5DF2\u505C\u7528,\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+login_error_code_005=\u767B\u5F55\u8D26\u53F7\u5DF2\u5B58\u5728
+login_error_code_006=\u8BE5\u7528\u6237\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u4EBA\u5458\u5904\u7406
+login_error_code_007=\u4E0D\u5141\u8BB8\u505C\u7528\u5F53\u524D\u767B\u5F55\u8D26\u6237
+login_error_code_008=\u4E0D\u80FD\u4E0E\u65E7\u5BC6\u7801\u76F8\u540C
+login_error_code_009=\u65E7\u5BC6\u7801\u9519\u8BEF
+login_error_code_010=\u89D2\u8272\u4FE1\u606F\u6709\u8BEF
+
+role_error_code_001=\u89D2\u8272\u540D\u5DF2\u5B58\u5728
+
+market_run_message_001=\u5F3A\u5236\u4E0B\u7EBF\u5DF2\u53D1\u9001
+
+organ_error_code_001=\u5DF2\u5206\u914D\u89D2\u8272,\u65E0\u6CD5\u6CE8\u9500
+organ_error_code_002=\u5B58\u5728\u4E0B\u7EA7\u673A\u6784,\u65E0\u6CD5\u6CE8\u9500
+organ_error_code_003=\u5B58\u5728\u4E0B\u7EA7\u6295\u8D44\u8005,\u65E0\u6CD5\u6CE8\u9500
+organ_error_code_004=\u6709\u5269\u4F59\u8D44\u91D1,\u65E0\u6CD5\u6CE8\u9500
+organ_error_code_005=\u6709\u5269\u4F59\u6301\u4ED3,\u65E0\u6CD5\u6CE8\u9500
+organ_error_code_006=\u8BC1\u4EF6\u53F7\u7801\u5DF2\u5B58\u5728\u6B63\u5E38\u8BB0\u5F55,\u65E0\u6CD5\u6062\u590D
+organ_error_code_007=\u624B\u673A\u53F7\u5DF2\u5B58\u5728\u6B63\u5E38\u8BB0\u5F55,\u65E0\u6CD5\u6062\u590D
+organ_error_code_008=\u4E0A\u7EA7\u673A\u6784\u4E3A\u975E\u6B63\u5E38\u72B6\u6001,\u65E0\u6CD5\u6062\u590D
+organ_error_code_009=\u6240\u5C5E\u4F1A\u5458\u6CA1\u6709\u7ECF\u7EAA\u89D2\u8272,\u65E0\u6CD5\u6062\u590D
+organ_error_code_010=\u4EE3\u7801\u6216\u673A\u6784\u4EE3\u7801\u91CD\u590D
+organ_error_code_011=\u8BC1\u4EF6\u53F7\u7801\u5DF2\u5B58\u5728
+organ_error_code_012=\u8BC1\u4EF6\u53F7\u7801\u5DF2\u5B58\u5728\u9ED1\u540D\u5355\u4E2D,\u4E0D\u80FD\u5F00\u6237
+organ_error_code_013=\u540D\u79F0\u5DF2\u5B58\u5728
+organ_error_code_014=\u7BA1\u7406\u5458\u767B\u5F55\u5E10\u53F7\u91CD\u590D
+organ_error_code_015=\u65B0\u589E\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+organ_error_code_016=\u624B\u673A\u53F7\u5DF2\u5B58\u5728
+organ_error_code_017=\u4F01\u4E1A\u540D\u79F0\u5DF2\u5B58\u5728
+organ_error_code_018=\u8BE5\u673A\u6784\u4FE1\u606F\u5DF2\u53D8\u66F4,\u8BF7\u5237\u65B0\u6570\u636E
+organ_error_code_019=\u8BC1\u4EF6\u53F7\u7801\u6216\u624B\u673A\u53F7\u5DF2\u5B58\u5728
+organ_error_code_020=\u5BA1\u6838\u62D2\u7EDD\u539F\u56E0\u4E0D\u80FD\u8D85\u8FC780\u4E2A\u5B57
+organ_error_code_021=\u8BE5\u6295\u8D44\u8005\u4FE1\u606F\u5DF2\u53D8\u66F4,\u8BF7\u5237\u65B0\u6570\u636E
+organ_error_code_022=\u975E\u5F85\u5BA1\u6838\u72B6\u6001,\u65E0\u6CD5\u64A4\u56DE
+organ_error_code_023=\u6240\u5C5E\u4F1A\u5458\u4E3A\u975E\u6B63\u5E38\u72B6\u6001,\u65E0\u6CD5\u5BA1\u6838\u901A\u8FC7
+organ_error_code_024=\u6240\u5C5E\u673A\u6784\u4E3A\u975E\u6B63\u5E38\u72B6\u6001,\u65E0\u6CD5\u5BA1\u6838\u901A\u8FC7
+organ_error_code_025=\u6240\u5C5E\u7ECF\u7EAA\u4EBA\u4E3A\u975E\u6B63\u5E38\u72B6\u6001,\u65E0\u6CD5\u5BA1\u6838\u901A\u8FC7
+organ_error_code_026=\u5B58\u5728\u4E0B\u7EA7\u7ECF\u7EAA\u4F1A\u5458,\u65E0\u6CD5\u5220\u9664
+organ_error_code_027=\u5B58\u5728\u4E0B\u7EA7\u4ED3\u5E93,\u65E0\u6CD5\u5220\u9664
+organ_error_code_028=\u505A\u5E02\u4F1A\u5458\u5DF2\u7B7E\u7EA6,\u65E0\u6CD5\u5220\u9664
+organ_error_code_029=\u505A\u5E02\u4F1A\u5458\u662F\u9ED8\u8BA4\u62A5\u4EF7\u5546,\u65E0\u6CD5\u5220\u9664
+organ_error_code_030=\u505A\u5E02\u4F1A\u5458\u5DF2\u914D\u7F6E\u4E8C\u7EA7\u5BF9\u624B\u5173\u7CFB,\u65E0\u6CD5\u5220\u9664
+organ_error_code_031=\u505A\u5E02\u4F1A\u5458\u88AB\u573A\u5916\u671F\u6743\u505A\u5E02\u5F15\u7528,\u65E0\u6CD5\u5220\u9664
+organ_error_code_032=\u5B58\u5728\u79EF\u5206\u7C7B\u578B,\u65E0\u6CD5\u5220\u9664
+organ_error_code_033=\u62A5\u4EF7\u673A\u6784\u88AB\u5F15\u7528,\u65E0\u6CD5\u5220\u9664
+organ_error_code_034=\u4E0A\u7EA7\u4E0D\u80FD\u4E3A\u81EA\u5DF1
+organ_error_code_035=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u4E8E100
+
+
+profit_shar_error_code_001=\u8BF7\u5148\u5220\u9664\u5206\u6DA6\u914D\u7F6E
+profit_shar_error_code_002=\u8BF7\u5148\u5220\u9664\u5206\u7EC4\u4EBA\u5458
+profit_shar_error_code_003=\u8BE5\u8D39\u7528\u7C7B\u578B\u5DF2\u5B58\u5728\u5206\u6DA6\u914D\u7F6E
+
+query_error_code_001=\u8BF7\u9009\u62E9\u5E02\u573A\u67E5\u8BE2
+query_error_code_002=\u5386\u53F2\u67E5\u8BE2\u8BF7\u9009\u62E9\u5F00\u59CB\u65E5\u671F
+query_error_code_003=\u5386\u53F2\u67E5\u8BE2\u8BF7\u9009\u62E9\u7ED3\u675F\u65E5\u671F
+query_error_code_004=\u6CA1\u6709\u6B64\u6743\u9650
+query_error_code_005=\u65E0\u6570\u636E\u53EF\u5BFC\u51FA
+query_error_code_006=\u5BFC\u51FA\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01
+query_error_code_007=\u8BF7\u8F93\u5165\u8D44\u91D1\u8D26\u6237
+query_error_code_008=\u5E02\u573A\u9519\u8BEF\u6216\u72B6\u6001\u4E0D\u4E3A\u5F00\u5E02\u72B6\u6001
+query_error_code_009=\u53C2\u6570\u9519\u8BEF
+query_error_code_010=\u5BFC\u5165\u6587\u4EF6\u4E3A\u7A7A
+
+report_error_code_001=\u8D77\u59CB\u4EA4\u6613\u65E5{0},\u7ED3\u675F\u4EA4\u6613\u65E5{1}\u6267\u884C\u62A5\u8868\u91CD\u65B0\u7EDF\u8BA1\u51FA\u9519
+
+settlement_message_001=\u786E\u8BA4\u4ED8\u6B3E\u5B8C\u6210: {0} \u6761\u6210\u529F, {1} \u6761\u5931\u8D25
+settlement_message_002=\u6570\u636E\u6709\u53D8\u66F4\uFF0C\u8BF7\u5237\u65B0\u91CD\u8BD5
+
+pwd_error_code_001=\u8BF7\u586B\u5199\u65E7\u5BC6\u7801
+pwd_error_code_002=\u8BF7\u586B\u5199\u65B0\u5BC6\u7801
+pwd_error_code_003=\u8BF7\u586B\u5199\u65B0\u5BC6\u7801\u786E\u8BA4
+pwd_error_code_004=\u4E24\u6B21\u5BC6\u7801\u4E0D\u4E00\u81F4
+pwd_error_code_005=\u65E7\u5BC6\u7801\u9519\u8BEF
+
+amount_error_code_001=\u91D1\u989D\u4E3A 0,\u4E0D\u505A\u5904\u7406!
+
+traAcc_error_code_001=\u767B\u5F55\u8D26\u6237\u91CD\u590D,\u8BF7\u70B9\u51FB\u91CD\u65B0\u751F\u5B58\u5E76\u518D\u6B21\u63D0\u4EA4!
+
+investor_error_code_001=\u6CA1\u6709\u627E\u5230\u8D44\u91D1\u8D26\u6237
+investor_error_code_002=\u975E\u6295\u8D44\u8005\u8D26\u6237,\u4E0D\u80FD\u9500\u6237\u5BA1\u6838.
+investor_error_code_003=\u8D44\u91D1\u8D26\u6237\u672A\u89E3\u7EA6,\u4E0D\u80FD\u9500\u6237.
+investor_error_code_004=\u8D26\u6237\u5B58\u5728\u8D44\u91D1\u3001\u6301\u4ED3\u7B49\u76F8\u5173\u4FE1\u606F,\u4E0D\u80FD\u6CE8\u9500.
+investor_error_code_005=\u8D44\u91D1\u8D26\u6237\u8BF7\u6C42\u6CA1\u6709\u56DE\u5E94.
+investor_error_code_006=\u5206\u7EC4\u540D\u91CD\u590D.
+investor_error_code_007=\u8BF7\u9009\u62E9\u6295\u8D44\u8005.
+investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7EC4.
+investor_error_code_009=\u8BF7\u5148\u79FB\u9664\u8BE5\u5206\u7EC4\u4E0B\u6240\u6709\u6295\u8D44\u8005.
+investor_error_code_010=\u8BF7\u5148\u5220\u9664\u8BE5\u5206\u7EC4\u7684\u4E2A\u6027\u5316\u8BBE\u7F6E.
+investor_error_code_011=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u4E8E10000
+
+warehouse_error_code_01=\u4ED3\u5E93\u4EE3\u7801\u6700\u591A10\u4F4D
+warehouse_error_code_02=\u4ED3\u5E93\u4EE3\u7801\u91CD\u590D
+warehouse_error_code_03=\u4ED3\u5E93\u540D\u79F0\u91CD\u590D
+warehouse_error_code_04=\u6570\u636E\u9519\u8BEF\uFF1A\u673A\u6784\u6570\u636E\u7F3A\u5931
+warehouse_error_code_05=\u8BE5\u4ED3\u5E93\u5DF2\u5173\u8054\u73B0\u8D27\u54C1\u79CD\uFF0C\u4E0D\u80FD\u6CE8\u9500
+
+message_notice_error_code_01=\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u4F1A\u5458\uFF01
+message_notice_error_code_02=\u672A\u627E\u5230\u4F1A\u5458\uFF01\uFF01\uFF01

+ 151 - 145
mtp3-century/src/main/resources/message_zh-hk.properties

@@ -1,146 +1,152 @@
-message_code_system001=操作成功
-message_code_system003=修改成功
-message_code_system004=簽約成功
-message_code_system005=解約成功
-message_code_system006=獲取驗證碼成功
-message_code_system007=登入成功
-message_code_system008=出金成功
-message_code_system009=入金成功
-message_code_system010=用戶認證通過
-message_code_system011=斬倉恢復操作成功
-message_code_system012=支付貨款成功
-message_code_system013=預售搖號成功
-message_code_system014=預售完成成功
-message_code_system015=預售申請成功
-message_code_system016=履約確認資訊已發送並處理中,稍後請重新查詢
-message_code_system017=申請成功
-message_code_system018=履約聯絡資訊已發送,稍後請重新查詢
-message_code_system019=執行成功
-message_code_system020=批量導入持倉過戶成功
-message_code_system021=提交成功,閉市後自動進行轉移
-message_code_system022=該數據已經稽核完成或處理中
-message_code_system023=沒有找到交易商資金帳戶
-message_code_system024=稽核拒絕
-message_code_system025=非交易商帳戶,不能銷戶稽核
-message_code_system026=資金帳戶未解約,不能銷戶
-message_code_system027=還剩{0}次錯誤機會,帳號或密碼不匹配達到{1}次,登入帳號將鎖定{2}分鐘{3}
-
-message_error_code_system001=權杖失效,請重新登入!
-message_error_code_system002=操作失敗
-message_error_code_system003=沒有該用戶的操作許可權!
-message_error_code_system004=文件上傳失敗,請聯系管理人員處理!
-message_error_code_system005=您的申請已提交,請稍後查詢結果。
-message_error_code_system006=請求超時,請稍後重試
-message_error_code_system007=系統維護中,請稍後再試
-message_error_code_system008=系統异常,請聯系管理員
-message_error_code_system009=認證服務不正常
-message_error_code_system010=用戶帳戶不存在
-message_error_code_system011=帳戶或密碼錯誤
-message_error_code_system012=用戶帳戶已被鎖
-message_error_code_system013=用戶密碼已失效
-message_error_code_system014=用戶帳戶已禁用
-message_error_code_system015=存在未處理的違約申請,不能重複發起
-message_error_code_system016=履約計畫步驟已發生變更,無法申請延期
-message_error_code_system017=定金轉讓市場,請選擇商品發行方【{0}】
-message_error_code_system018=請於系統日終處理成功時執行
-
-login_error_code_001=帳戶或密碼錯誤
-login_error_code_002=未經允許,不可訪問! 請聯系管理員處理!
-login_error_code_003=登入鎖定!
-login_error_code_004=帳戶已停用,請聯系管理員
-login_error_code_005=登入帳號已存在
-login_error_code_006=該用戶不存在,請聯系管理人員處理
-login_error_code_007=不允許停用當前登入帳戶
-login_error_code_008=不能與舊密碼相同
-login_error_code_009=舊密碼錯誤
-login_error_code_010=角色資訊有誤
-
-role_error_code_001=角色名已存在
-
-market_run_message_001=強制下線已發送
-
-organ_error_code_001=已分配角色,無法註銷
-organ_error_code_002=存在下級機构,無法註銷
-organ_error_code_003=存在下級投資者,無法註銷
-organ_error_code_004=有剩餘資金,無法註銷
-organ_error_code_005=有剩餘持倉,無法註銷
-organ_error_code_006=證件號碼已存在正常記錄,無法恢復
-organ_error_code_007=手機號已存在正常記錄,無法恢復
-organ_error_code_008=上級機构為非正常狀態,無法恢復
-organ_error_code_009=所屬會員沒有經紀角色,無法恢復
-organ_error_code_010=程式碼或機构程式碼重複
-organ_error_code_011=證件號碼已存在
-organ_error_code_012=證件號碼已存在黑名單中,不能開戶
-organ_error_code_013=名稱已存在
-organ_error_code_014=管理員登錄帳號重複
-organ_error_code_015=新增失敗,請聯系管理員
-organ_error_code_016=手機號已存在
-organ_error_code_017=企業名稱已存在
-organ_error_code_018=該機构資訊已變更,請重繪數據
-organ_error_code_019=證件號碼或手機號已存在
-organ_error_code_020=稽核拒絕原因不能超過80個字
-organ_error_code_021=該投資者資訊已變更,請重繪數據
-organ_error_code_022=非待稽核狀態,無法撤回
-organ_error_code_023=所屬會員為非正常狀態,無法稽核通過
-organ_error_code_024=所屬機构為非正常狀態,無法稽核通過
-organ_error_code_025=所屬經紀人為非正常狀態,無法稽核通過
-organ_error_code_026=存在下級經紀會員,無法删除
-organ_error_code_027=存在下級倉庫,無法删除
-organ_error_code_028=做市會員已簽約,無法删除
-organ_error_code_029=做市會員是默認報價商,無法删除
-organ_error_code_030=做市會員已配寘二級對手關係,無法删除
-organ_error_code_031=做市會員被場外期權做市引用,無法删除
-organ_error_code_032=存在積分類型,無法删除
-organ_error_code_033=報價機构被引用,無法删除
-organ_error_code_034=上級不能為自己
-organ_error_code_035=比率值不能大於100
-
-
-profit_shar_error_code_001=請先删除分潤配寘
-profit_shar_error_code_002=請先删除分組人員
-profit_shar_error_code_003=該費用類型已存在分潤配寘
-
-query_error_code_001=請選擇市場査詢
-query_error_code_002=歷史査詢請選擇開始日期
-query_error_code_003=歷史査詢請選擇結束日期
-query_error_code_004=沒有此許可權
-query_error_code_005=無數據可匯出
-query_error_code_006=匯出失敗,請聯系管理員!
-query_error_code_007=請輸入資金帳戶
-query_error_code_008=市場錯誤或狀態不為開市狀態
-query_error_code_009=參數錯誤
-query_error_code_010=導入檔案為空
-
-report_error_code_001=起始交易日{0},結束交易日{1}執行報表重新統計出錯
-
-settlement_message_001=確認付款完成:{0}條成功,{1}條失敗
-settlement_message_002=數據有變更,請重繪重試
-
-pwd_error_code_001=請填寫舊密碼
-pwd_error_code_002=請填寫新密碼
-pwd_error_code_003=請填寫新密碼確認
-pwd_error_code_004=兩次密碼不一致
-pwd_error_code_005=舊密碼錯誤
-
-amount_error_code_001=金額為0,不做處理!
-
-traAcc_error_code_001=登入帳戶重複,請點擊重新生存並再次提交!
-
-investor_error_code_001=沒有找到資金帳戶
-investor_error_code_002=非投資者帳戶,不能銷戶稽核.
-investor_error_code_003=資金帳戶未解約,不能銷戶.
-investor_error_code_004=帳戶存在資金、持倉等相關資訊,不能註銷.
-investor_error_code_005=資金帳戶請求沒有回應.
-investor_error_code_006=分組名重複.
-investor_error_code_007=請選擇投資者.
-investor_error_code_008={0}已分配分組.
-investor_error_code_009=請先移除該分組下所有投資者.
-investor_error_code_010=請先删除該分組的個性化設定.
-investor_error_code_011=比率值不能大於10000
-
-warehouse_error_code_01=倉庫程式碼最多10比特
-warehouse_error_code_02=倉庫程式碼重複
-warehouse_error_code_03=倉庫名稱重複
-warehouse_error_code_04=數據錯誤:機构數據缺失
-warehouse_error_code_05=該倉庫已關聯現貨品種,不能註銷
+message_code_system001=\u64CD\u4F5C\u6210\u529F
+message_code_system003=\u4FEE\u6539\u6210\u529F
+message_code_system004=\u7C3D\u7D04\u6210\u529F
+message_code_system005=\u89E3\u7D04\u6210\u529F
+message_code_system006=\u7372\u53D6\u9A57\u8B49\u78BC\u6210\u529F
+message_code_system007=\u767B\u5165\u6210\u529F
+message_code_system008=\u51FA\u91D1\u6210\u529F
+message_code_system009=\u5165\u91D1\u6210\u529F
+message_code_system010=\u7528\u6236\u8A8D\u8B49\u901A\u904E
+message_code_system011=\u65AC\u5009\u6062\u5FA9\u64CD\u4F5C\u6210\u529F
+message_code_system012=\u652F\u4ED8\u8CA8\u6B3E\u6210\u529F
+message_code_system013=\u9810\u552E\u6416\u865F\u6210\u529F
+message_code_system014=\u9810\u552E\u5B8C\u6210\u6210\u529F
+message_code_system015=\u9810\u552E\u7533\u8ACB\u6210\u529F
+message_code_system016=\u5C65\u7D04\u78BA\u8A8D\u8CC7\u8A0A\u5DF2\u767C\u9001\u4E26\u8655\u7406\u4E2D\uFF0C\u7A0D\u5F8C\u8ACB\u91CD\u65B0\u67E5\u8A62
+message_code_system017=\u7533\u8ACB\u6210\u529F
+message_code_system018=\u5C65\u7D04\u806F\u7D61\u8CC7\u8A0A\u5DF2\u767C\u9001\uFF0C\u7A0D\u5F8C\u8ACB\u91CD\u65B0\u67E5\u8A62
+message_code_system019=\u57F7\u884C\u6210\u529F
+message_code_system020=\u6279\u91CF\u5C0E\u5165\u6301\u5009\u904E\u6236\u6210\u529F
+message_code_system021=\u63D0\u4EA4\u6210\u529F\uFF0C\u9589\u5E02\u5F8C\u81EA\u52D5\u9032\u884C\u8F49\u79FB
+message_code_system022=\u8A72\u6578\u64DA\u5DF2\u7D93\u7A3D\u6838\u5B8C\u6210\u6216\u8655\u7406\u4E2D
+message_code_system023=\u6C92\u6709\u627E\u5230\u4EA4\u6613\u5546\u8CC7\u91D1\u5E33\u6236
+message_code_system024=\u7A3D\u6838\u62D2\u7D55
+message_code_system025=\u975E\u4EA4\u6613\u5546\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838
+message_code_system026=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236
+message_code_system027=\u9084\u5269{0}\u6B21\u932F\u8AA4\u6A5F\u6703\uFF0C\u5E33\u865F\u6216\u5BC6\u78BC\u4E0D\u5339\u914D\u9054\u5230{1}\u6B21\uFF0C\u767B\u5165\u5E33\u865F\u5C07\u9396\u5B9A{2}\u5206\u9418{3}
+message_code_system028=\u9ED1\u540D\u55AE\u5DF2\u6709\u6B64\u8B49\u4EF6!
+message_code_system029=IP\u5730\u5740\u4E0D\u80FD\u70BA\u7A7A\u503C!
+message_code_system030=IP\u5730\u5740\u91CD\u8907!
+
+message_error_code_system001=\u6B0A\u6756\u5931\u6548\uFF0C\u8ACB\u91CD\u65B0\u767B\u5165\uFF01
+message_error_code_system002=\u64CD\u4F5C\u5931\u6557
+message_error_code_system003=\u6C92\u6709\u8A72\u7528\u6236\u7684\u64CD\u4F5C\u8A31\u53EF\u6B0A\uFF01
+message_error_code_system004=\u6587\u4EF6\u4E0A\u50B3\u5931\u6557\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u4EBA\u54E1\u8655\u7406\uFF01
+message_error_code_system005=\u60A8\u7684\u7533\u8ACB\u5DF2\u63D0\u4EA4\uFF0C\u8ACB\u7A0D\u5F8C\u67E5\u8A62\u7D50\u679C\u3002
+message_error_code_system006=\u8ACB\u6C42\u8D85\u6642\uFF0C\u8ACB\u7A0D\u5F8C\u91CD\u8A66
+message_error_code_system007=\u7CFB\u7D71\u7DAD\u8B77\u4E2D\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66
+message_error_code_system008=\u7CFB\u7D71\u5F02\u5E38\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1
+message_error_code_system009=\u8A8D\u8B49\u670D\u52D9\u4E0D\u6B63\u5E38
+message_error_code_system010=\u7528\u6236\u5E33\u6236\u4E0D\u5B58\u5728
+message_error_code_system011=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
+message_error_code_system012=\u7528\u6236\u5E33\u6236\u5DF2\u88AB\u9396
+message_error_code_system013=\u7528\u6236\u5BC6\u78BC\u5DF2\u5931\u6548
+message_error_code_system014=\u7528\u6236\u5E33\u6236\u5DF2\u7981\u7528
+message_error_code_system015=\u5B58\u5728\u672A\u8655\u7406\u7684\u9055\u7D04\u7533\u8ACB\uFF0C\u4E0D\u80FD\u91CD\u8907\u767C\u8D77
+message_error_code_system016=\u5C65\u7D04\u8A08\u756B\u6B65\u9A5F\u5DF2\u767C\u751F\u8B8A\u66F4\uFF0C\u7121\u6CD5\u7533\u8ACB\u5EF6\u671F
+message_error_code_system017=\u5B9A\u91D1\u8F49\u8B93\u5E02\u5834\uFF0C\u8ACB\u9078\u64C7\u5546\u54C1\u767C\u884C\u65B9\u3010{0}\u3011
+message_error_code_system018=\u8ACB\u65BC\u7CFB\u7D71\u65E5\u7D42\u8655\u7406\u6210\u529F\u6642\u57F7\u884C
+
+login_error_code_001=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
+login_error_code_002=\u672A\u7D93\u5141\u8A31\uFF0C\u4E0D\u53EF\u8A2A\u554F\uFF01 \u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\u8655\u7406\uFF01
+login_error_code_003=\u767B\u5165\u9396\u5B9A\uFF01
+login_error_code_004=\u5E33\u6236\u5DF2\u505C\u7528\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1
+login_error_code_005=\u767B\u5165\u5E33\u865F\u5DF2\u5B58\u5728
+login_error_code_006=\u8A72\u7528\u6236\u4E0D\u5B58\u5728\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u4EBA\u54E1\u8655\u7406
+login_error_code_007=\u4E0D\u5141\u8A31\u505C\u7528\u7576\u524D\u767B\u5165\u5E33\u6236
+login_error_code_008=\u4E0D\u80FD\u8207\u820A\u5BC6\u78BC\u76F8\u540C
+login_error_code_009=\u820A\u5BC6\u78BC\u932F\u8AA4
+login_error_code_010=\u89D2\u8272\u8CC7\u8A0A\u6709\u8AA4
+
+role_error_code_001=\u89D2\u8272\u540D\u5DF2\u5B58\u5728
+
+market_run_message_001=\u5F37\u5236\u4E0B\u7DDA\u5DF2\u767C\u9001
+
+organ_error_code_001=\u5DF2\u5206\u914D\u89D2\u8272\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_002=\u5B58\u5728\u4E0B\u7D1A\u6A5F\u6784\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_003=\u5B58\u5728\u4E0B\u7D1A\u6295\u8CC7\u8005\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_004=\u6709\u5269\u9918\u8CC7\u91D1\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_005=\u6709\u5269\u9918\u6301\u5009\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_006=\u8B49\u4EF6\u865F\u78BC\u5DF2\u5B58\u5728\u6B63\u5E38\u8A18\u9304\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_007=\u624B\u6A5F\u865F\u5DF2\u5B58\u5728\u6B63\u5E38\u8A18\u9304\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_008=\u4E0A\u7D1A\u6A5F\u6784\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_009=\u6240\u5C6C\u6703\u54E1\u6C92\u6709\u7D93\u7D00\u89D2\u8272\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_010=\u7A0B\u5F0F\u78BC\u6216\u6A5F\u6784\u7A0B\u5F0F\u78BC\u91CD\u8907
+organ_error_code_011=\u8B49\u4EF6\u865F\u78BC\u5DF2\u5B58\u5728
+organ_error_code_012=\u8B49\u4EF6\u865F\u78BC\u5DF2\u5B58\u5728\u9ED1\u540D\u55AE\u4E2D\uFF0C\u4E0D\u80FD\u958B\u6236
+organ_error_code_013=\u540D\u7A31\u5DF2\u5B58\u5728
+organ_error_code_014=\u7BA1\u7406\u54E1\u767B\u9304\u5E33\u865F\u91CD\u8907
+organ_error_code_015=\u65B0\u589E\u5931\u6557\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1
+organ_error_code_016=\u624B\u6A5F\u865F\u5DF2\u5B58\u5728
+organ_error_code_017=\u4F01\u696D\u540D\u7A31\u5DF2\u5B58\u5728
+organ_error_code_018=\u8A72\u6A5F\u6784\u8CC7\u8A0A\u5DF2\u8B8A\u66F4\uFF0C\u8ACB\u91CD\u7E6A\u6578\u64DA
+organ_error_code_019=\u8B49\u4EF6\u865F\u78BC\u6216\u624B\u6A5F\u865F\u5DF2\u5B58\u5728
+organ_error_code_020=\u7A3D\u6838\u62D2\u7D55\u539F\u56E0\u4E0D\u80FD\u8D85\u904E80\u500B\u5B57
+organ_error_code_021=\u8A72\u6295\u8CC7\u8005\u8CC7\u8A0A\u5DF2\u8B8A\u66F4\uFF0C\u8ACB\u91CD\u7E6A\u6578\u64DA
+organ_error_code_022=\u975E\u5F85\u7A3D\u6838\u72C0\u614B\uFF0C\u7121\u6CD5\u64A4\u56DE
+organ_error_code_023=\u6240\u5C6C\u6703\u54E1\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u7A3D\u6838\u901A\u904E
+organ_error_code_024=\u6240\u5C6C\u6A5F\u6784\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u7A3D\u6838\u901A\u904E
+organ_error_code_025=\u6240\u5C6C\u7D93\u7D00\u4EBA\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u7A3D\u6838\u901A\u904E
+organ_error_code_026=\u5B58\u5728\u4E0B\u7D1A\u7D93\u7D00\u6703\u54E1\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_027=\u5B58\u5728\u4E0B\u7D1A\u5009\u5EAB\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_028=\u505A\u5E02\u6703\u54E1\u5DF2\u7C3D\u7D04\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_029=\u505A\u5E02\u6703\u54E1\u662F\u9ED8\u8A8D\u5831\u50F9\u5546\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_030=\u505A\u5E02\u6703\u54E1\u5DF2\u914D\u5BD8\u4E8C\u7D1A\u5C0D\u624B\u95DC\u4FC2\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_031=\u505A\u5E02\u6703\u54E1\u88AB\u5834\u5916\u671F\u6B0A\u505A\u5E02\u5F15\u7528\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_032=\u5B58\u5728\u7A4D\u5206\u985E\u578B\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_033=\u5831\u50F9\u6A5F\u6784\u88AB\u5F15\u7528\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_034=\u4E0A\u7D1A\u4E0D\u80FD\u70BA\u81EA\u5DF1
+organ_error_code_035=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u65BC100
+
+
+profit_shar_error_code_001=\u8ACB\u5148\u5220\u9664\u5206\u6F64\u914D\u5BD8
+profit_shar_error_code_002=\u8ACB\u5148\u5220\u9664\u5206\u7D44\u4EBA\u54E1
+profit_shar_error_code_003=\u8A72\u8CBB\u7528\u985E\u578B\u5DF2\u5B58\u5728\u5206\u6F64\u914D\u5BD8
+
+query_error_code_001=\u8ACB\u9078\u64C7\u5E02\u5834\u67FB\u8A62
+query_error_code_002=\u6B77\u53F2\u67FB\u8A62\u8ACB\u9078\u64C7\u958B\u59CB\u65E5\u671F
+query_error_code_003=\u6B77\u53F2\u67FB\u8A62\u8ACB\u9078\u64C7\u7D50\u675F\u65E5\u671F
+query_error_code_004=\u6C92\u6709\u6B64\u8A31\u53EF\u6B0A
+query_error_code_005=\u7121\u6578\u64DA\u53EF\u532F\u51FA
+query_error_code_006=\u532F\u51FA\u5931\u6557\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\uFF01
+query_error_code_007=\u8ACB\u8F38\u5165\u8CC7\u91D1\u5E33\u6236
+query_error_code_008=\u5E02\u5834\u932F\u8AA4\u6216\u72C0\u614B\u4E0D\u70BA\u958B\u5E02\u72C0\u614B
+query_error_code_009=\u53C3\u6578\u932F\u8AA4
+query_error_code_010=\u5C0E\u5165\u6A94\u6848\u70BA\u7A7A
+
+report_error_code_001=\u8D77\u59CB\u4EA4\u6613\u65E5{0},\u7D50\u675F\u4EA4\u6613\u65E5{1}\u57F7\u884C\u5831\u8868\u91CD\u65B0\u7D71\u8A08\u51FA\u932F
+
+settlement_message_001=\u78BA\u8A8D\u4ED8\u6B3E\u5B8C\u6210:{0}\u689D\u6210\u529F,{1}\u689D\u5931\u6557
+settlement_message_002=\u6578\u64DA\u6709\u8B8A\u66F4\uFF0C\u8ACB\u91CD\u7E6A\u91CD\u8A66
+
+pwd_error_code_001=\u8ACB\u586B\u5BEB\u820A\u5BC6\u78BC
+pwd_error_code_002=\u8ACB\u586B\u5BEB\u65B0\u5BC6\u78BC
+pwd_error_code_003=\u8ACB\u586B\u5BEB\u65B0\u5BC6\u78BC\u78BA\u8A8D
+pwd_error_code_004=\u5169\u6B21\u5BC6\u78BC\u4E0D\u4E00\u81F4
+pwd_error_code_005=\u820A\u5BC6\u78BC\u932F\u8AA4
+
+amount_error_code_001=\u91D1\u984D\u70BA0\uFF0C\u4E0D\u505A\u8655\u7406\uFF01
+
+traAcc_error_code_001=\u767B\u5165\u5E33\u6236\u91CD\u8907\uFF0C\u8ACB\u9EDE\u64CA\u91CD\u65B0\u751F\u5B58\u4E26\u518D\u6B21\u63D0\u4EA4!
+
+investor_error_code_001=\u6C92\u6709\u627E\u5230\u8CC7\u91D1\u5E33\u6236
+investor_error_code_002=\u975E\u6295\u8CC7\u8005\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838.
+investor_error_code_003=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236.
+investor_error_code_004=\u5E33\u6236\u5B58\u5728\u8CC7\u91D1\u3001\u6301\u5009\u7B49\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u4E0D\u80FD\u8A3B\u92B7.
+investor_error_code_005=\u8CC7\u91D1\u5E33\u6236\u8ACB\u6C42\u6C92\u6709\u56DE\u61C9.
+investor_error_code_006=\u5206\u7D44\u540D\u91CD\u8907.
+investor_error_code_007=\u8ACB\u9078\u64C7\u6295\u8CC7\u8005.
+investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7D44.
+investor_error_code_009=\u8ACB\u5148\u79FB\u9664\u8A72\u5206\u7D44\u4E0B\u6240\u6709\u6295\u8CC7\u8005.
+investor_error_code_010=\u8ACB\u5148\u5220\u9664\u8A72\u5206\u7D44\u7684\u500B\u6027\u5316\u8A2D\u5B9A.
+investor_error_code_011=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u65BC10000
+
+warehouse_error_code_01=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u6700\u591A10\u6BD4\u7279
+warehouse_error_code_02=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u91CD\u8907
+warehouse_error_code_03=\u5009\u5EAB\u540D\u7A31\u91CD\u8907
+warehouse_error_code_04=\u6578\u64DA\u932F\u8AA4\uFF1A\u6A5F\u6784\u6578\u64DA\u7F3A\u5931
+warehouse_error_code_05=\u8A72\u5009\u5EAB\u5DF2\u95DC\u806F\u73FE\u8CA8\u54C1\u7A2E\uFF0C\u4E0D\u80FD\u8A3B\u92B7
+
+message_notice_error_code_01=\u8ACB\u81F3\u5C11\u9078\u64C7\u4E00\u500B\u6703\u54E1\uFF01
+message_notice_error_code_02=\u672A\u627E\u5230\u6703\u54E1\uFF01\uFF01\uFF01
 

+ 151 - 145
mtp3-century/src/main/resources/message_zh-tw.properties

@@ -1,145 +1,151 @@
-message_code_system001=操作成功
-message_code_system003=修改成功
-message_code_system004=簽約成功
-message_code_system005=解約成功
-message_code_system006=獲取驗證碼成功
-message_code_system007=登入成功
-message_code_system008=出金成功
-message_code_system009=入金成功
-message_code_system010=用戶認證通過
-message_code_system011=斬倉恢復操作成功
-message_code_system012=支付貨款成功
-message_code_system013=預售搖號成功
-message_code_system014=預售完成成功
-message_code_system015=預售申請成功
-message_code_system016=履約確認資訊已發送並處理中,稍後請重新查詢
-message_code_system017=申請成功
-message_code_system018=履約聯絡資訊已發送,稍後請重新查詢
-message_code_system019=執行成功
-message_code_system020=批量導入持倉過戶成功
-message_code_system021=提交成功,閉市後自動進行轉移
-message_code_system022=該數據已經稽核完成或處理中
-message_code_system023=沒有找到交易商資金帳戶
-message_code_system024=稽核拒絕
-message_code_system025=非交易商帳戶,不能銷戶稽核
-message_code_system026=資金帳戶未解約,不能銷戶
-message_code_system027=還剩{0}次錯誤機會,帳號或密碼不匹配達到{1}次,登入帳號將鎖定{2}分鐘{3}
-
-message_error_code_system001=權杖失效,請重新登入!
-message_error_code_system002=操作失敗
-message_error_code_system003=沒有該用戶的操作許可權!
-message_error_code_system004=文件上傳失敗,請聯系管理人員處理!
-message_error_code_system005=您的申請已提交,請稍後查詢結果。
-message_error_code_system006=請求超時,請稍後重試
-message_error_code_system007=系統維護中,請稍後再試
-message_error_code_system008=系統异常,請聯系管理員
-message_error_code_system009=認證服務不正常
-message_error_code_system010=用戶帳戶不存在
-message_error_code_system011=帳戶或密碼錯誤
-message_error_code_system012=用戶帳戶已被鎖
-message_error_code_system013=用戶密碼已失效
-message_error_code_system014=用戶帳戶已禁用
-message_error_code_system015=存在未處理的違約申請,不能重複發起
-message_error_code_system016=履約計畫步驟已發生變更,無法申請延期
-message_error_code_system017=定金轉讓市場,請選擇商品發行方【{0}】
-message_error_code_system018=請於系統日終處理成功時執行
-
-login_error_code_001=帳戶或密碼錯誤
-login_error_code_002=未經允許,不可訪問! 請聯系管理員處理!
-login_error_code_003=登入鎖定!
-login_error_code_004=帳戶已停用,請聯系管理員
-login_error_code_005=登入帳號已存在
-login_error_code_006=該用戶不存在,請聯系管理人員處理
-login_error_code_007=不允許停用當前登入帳戶
-login_error_code_008=不能與舊密碼相同
-login_error_code_009=舊密碼錯誤
-login_error_code_010=角色資訊有誤
-
-role_error_code_001=角色名已存在
-
-market_run_message_001=強制下線已發送
-
-organ_error_code_001=已分配角色,無法註銷
-organ_error_code_002=存在下級機构,無法註銷
-organ_error_code_003=存在下級投資者,無法註銷
-organ_error_code_004=有剩餘資金,無法註銷
-organ_error_code_005=有剩餘持倉,無法註銷
-organ_error_code_006=證件號碼已存在正常記錄,無法恢復
-organ_error_code_007=手機號已存在正常記錄,無法恢復
-organ_error_code_008=上級機构為非正常狀態,無法恢復
-organ_error_code_009=所屬會員沒有經紀角色,無法恢復
-organ_error_code_010=程式碼或機构程式碼重複
-organ_error_code_011=證件號碼已存在
-organ_error_code_012=證件號碼已存在黑名單中,不能開戶
-organ_error_code_013=名稱已存在
-organ_error_code_014=管理員登錄帳號重複
-organ_error_code_015=新增失敗,請聯系管理員
-organ_error_code_016=手機號已存在
-organ_error_code_017=企業名稱已存在
-organ_error_code_018=該機构資訊已變更,請重繪數據
-organ_error_code_019=證件號碼或手機號已存在
-organ_error_code_020=稽核拒絕原因不能超過80個字
-organ_error_code_021=該投資者資訊已變更,請重繪數據
-organ_error_code_022=非待稽核狀態,無法撤回
-organ_error_code_023=所屬會員為非正常狀態,無法稽核通過
-organ_error_code_024=所屬機构為非正常狀態,無法稽核通過
-organ_error_code_025=所屬經紀人為非正常狀態,無法稽核通過
-organ_error_code_026=存在下級經紀會員,無法删除
-organ_error_code_027=存在下級倉庫,無法删除
-organ_error_code_028=做市會員已簽約,無法删除
-organ_error_code_029=做市會員是默認報價商,無法删除
-organ_error_code_030=做市會員已配寘二級對手關係,無法删除
-organ_error_code_031=做市會員被場外期權做市引用,無法删除
-organ_error_code_032=存在積分類型,無法删除
-organ_error_code_033=報價機构被引用,無法删除
-organ_error_code_034=上級不能為自己
-organ_error_code_035=比率值不能大於100
-
-
-profit_shar_error_code_001=請先删除分潤配寘
-profit_shar_error_code_002=請先删除分組人員
-profit_shar_error_code_003=該費用類型已存在分潤配寘
-
-query_error_code_001=請選擇市場査詢
-query_error_code_002=歷史査詢請選擇開始日期
-query_error_code_003=歷史査詢請選擇結束日期
-query_error_code_004=沒有此許可權
-query_error_code_005=無數據可匯出
-query_error_code_006=匯出失敗,請聯系管理員!
-query_error_code_007=請輸入資金帳戶
-query_error_code_008=市場錯誤或狀態不為開市狀態
-query_error_code_009=參數錯誤
-query_error_code_010=導入檔案為空
-
-report_error_code_001=起始交易日{0},結束交易日{1}執行報表重新統計出錯
-
-settlement_message_001=確認付款完成:{0}條成功,{1}條失敗
-settlement_message_002=數據有變更,請重繪重試
-
-pwd_error_code_001=請填寫舊密碼
-pwd_error_code_002=請填寫新密碼
-pwd_error_code_003=請填寫新密碼確認
-pwd_error_code_004=兩次密碼不一致
-pwd_error_code_005=舊密碼錯誤
-
-amount_error_code_001=金額為0,不做處理!
-
-traAcc_error_code_001=登入帳戶重複,請點擊重新生存並再次提交!
-
-investor_error_code_001=沒有找到資金帳戶
-investor_error_code_002=非投資者帳戶,不能銷戶稽核.
-investor_error_code_003=資金帳戶未解約,不能銷戶.
-investor_error_code_004=帳戶存在資金、持倉等相關資訊,不能註銷.
-investor_error_code_005=資金帳戶請求沒有回應.
-investor_error_code_006=分組名重複.
-investor_error_code_007=請選擇投資者.
-investor_error_code_008={0}已分配分組.
-investor_error_code_009=請先移除該分組下所有投資者.
-investor_error_code_010=請先删除該分組的個性化設定.
-investor_error_code_011=比率值不能大於10000
-
-warehouse_error_code_01=倉庫程式碼最多10比特
-warehouse_error_code_02=倉庫程式碼重複
-warehouse_error_code_03=倉庫名稱重複
-warehouse_error_code_04=數據錯誤:機构數據缺失
-warehouse_error_code_05=該倉庫已關聯現貨品種,不能註銷
+message_code_system001=\u64CD\u4F5C\u6210\u529F
+message_code_system003=\u4FEE\u6539\u6210\u529F
+message_code_system004=\u7C3D\u7D04\u6210\u529F
+message_code_system005=\u89E3\u7D04\u6210\u529F
+message_code_system006=\u7372\u53D6\u9A57\u8B49\u78BC\u6210\u529F
+message_code_system007=\u767B\u5165\u6210\u529F
+message_code_system008=\u51FA\u91D1\u6210\u529F
+message_code_system009=\u5165\u91D1\u6210\u529F
+message_code_system010=\u7528\u6236\u8A8D\u8B49\u901A\u904E
+message_code_system011=\u65AC\u5009\u6062\u5FA9\u64CD\u4F5C\u6210\u529F
+message_code_system012=\u652F\u4ED8\u8CA8\u6B3E\u6210\u529F
+message_code_system013=\u9810\u552E\u6416\u865F\u6210\u529F
+message_code_system014=\u9810\u552E\u5B8C\u6210\u6210\u529F
+message_code_system015=\u9810\u552E\u7533\u8ACB\u6210\u529F
+message_code_system016=\u5C65\u7D04\u78BA\u8A8D\u8CC7\u8A0A\u5DF2\u767C\u9001\u4E26\u8655\u7406\u4E2D\uFF0C\u7A0D\u5F8C\u8ACB\u91CD\u65B0\u67E5\u8A62
+message_code_system017=\u7533\u8ACB\u6210\u529F
+message_code_system018=\u5C65\u7D04\u806F\u7D61\u8CC7\u8A0A\u5DF2\u767C\u9001\uFF0C\u7A0D\u5F8C\u8ACB\u91CD\u65B0\u67E5\u8A62
+message_code_system019=\u57F7\u884C\u6210\u529F
+message_code_system020=\u6279\u91CF\u5C0E\u5165\u6301\u5009\u904E\u6236\u6210\u529F
+message_code_system021=\u63D0\u4EA4\u6210\u529F\uFF0C\u9589\u5E02\u5F8C\u81EA\u52D5\u9032\u884C\u8F49\u79FB
+message_code_system022=\u8A72\u6578\u64DA\u5DF2\u7D93\u7A3D\u6838\u5B8C\u6210\u6216\u8655\u7406\u4E2D
+message_code_system023=\u6C92\u6709\u627E\u5230\u4EA4\u6613\u5546\u8CC7\u91D1\u5E33\u6236
+message_code_system024=\u7A3D\u6838\u62D2\u7D55
+message_code_system025=\u975E\u4EA4\u6613\u5546\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838
+message_code_system026=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236
+message_code_system027=\u9084\u5269{0}\u6B21\u932F\u8AA4\u6A5F\u6703\uFF0C\u5E33\u865F\u6216\u5BC6\u78BC\u4E0D\u5339\u914D\u9054\u5230{1}\u6B21\uFF0C\u767B\u5165\u5E33\u865F\u5C07\u9396\u5B9A{2}\u5206\u9418{3}
+message_code_system028=\u9ED1\u540D\u55AE\u5DF2\u6709\u6B64\u8B49\u4EF6!
+message_code_system029=IP\u5730\u5740\u4E0D\u80FD\u70BA\u7A7A\u503C!
+message_code_system030=IP\u5730\u5740\u91CD\u8907!
+
+message_error_code_system001=\u6B0A\u6756\u5931\u6548\uFF0C\u8ACB\u91CD\u65B0\u767B\u5165\uFF01
+message_error_code_system002=\u64CD\u4F5C\u5931\u6557
+message_error_code_system003=\u6C92\u6709\u8A72\u7528\u6236\u7684\u64CD\u4F5C\u8A31\u53EF\u6B0A\uFF01
+message_error_code_system004=\u6587\u4EF6\u4E0A\u50B3\u5931\u6557\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u4EBA\u54E1\u8655\u7406\uFF01
+message_error_code_system005=\u60A8\u7684\u7533\u8ACB\u5DF2\u63D0\u4EA4\uFF0C\u8ACB\u7A0D\u5F8C\u67E5\u8A62\u7D50\u679C\u3002
+message_error_code_system006=\u8ACB\u6C42\u8D85\u6642\uFF0C\u8ACB\u7A0D\u5F8C\u91CD\u8A66
+message_error_code_system007=\u7CFB\u7D71\u7DAD\u8B77\u4E2D\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66
+message_error_code_system008=\u7CFB\u7D71\u5F02\u5E38\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1
+message_error_code_system009=\u8A8D\u8B49\u670D\u52D9\u4E0D\u6B63\u5E38
+message_error_code_system010=\u7528\u6236\u5E33\u6236\u4E0D\u5B58\u5728
+message_error_code_system011=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
+message_error_code_system012=\u7528\u6236\u5E33\u6236\u5DF2\u88AB\u9396
+message_error_code_system013=\u7528\u6236\u5BC6\u78BC\u5DF2\u5931\u6548
+message_error_code_system014=\u7528\u6236\u5E33\u6236\u5DF2\u7981\u7528
+message_error_code_system015=\u5B58\u5728\u672A\u8655\u7406\u7684\u9055\u7D04\u7533\u8ACB\uFF0C\u4E0D\u80FD\u91CD\u8907\u767C\u8D77
+message_error_code_system016=\u5C65\u7D04\u8A08\u756B\u6B65\u9A5F\u5DF2\u767C\u751F\u8B8A\u66F4\uFF0C\u7121\u6CD5\u7533\u8ACB\u5EF6\u671F
+message_error_code_system017=\u5B9A\u91D1\u8F49\u8B93\u5E02\u5834\uFF0C\u8ACB\u9078\u64C7\u5546\u54C1\u767C\u884C\u65B9\u3010{0}\u3011
+message_error_code_system018=\u8ACB\u65BC\u7CFB\u7D71\u65E5\u7D42\u8655\u7406\u6210\u529F\u6642\u57F7\u884C
+
+login_error_code_001=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
+login_error_code_002=\u672A\u7D93\u5141\u8A31\uFF0C\u4E0D\u53EF\u8A2A\u554F\uFF01 \u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\u8655\u7406\uFF01
+login_error_code_003=\u767B\u5165\u9396\u5B9A\uFF01
+login_error_code_004=\u5E33\u6236\u5DF2\u505C\u7528\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1
+login_error_code_005=\u767B\u5165\u5E33\u865F\u5DF2\u5B58\u5728
+login_error_code_006=\u8A72\u7528\u6236\u4E0D\u5B58\u5728\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u4EBA\u54E1\u8655\u7406
+login_error_code_007=\u4E0D\u5141\u8A31\u505C\u7528\u7576\u524D\u767B\u5165\u5E33\u6236
+login_error_code_008=\u4E0D\u80FD\u8207\u820A\u5BC6\u78BC\u76F8\u540C
+login_error_code_009=\u820A\u5BC6\u78BC\u932F\u8AA4
+login_error_code_010=\u89D2\u8272\u8CC7\u8A0A\u6709\u8AA4
+
+role_error_code_001=\u89D2\u8272\u540D\u5DF2\u5B58\u5728
+
+market_run_message_001=\u5F37\u5236\u4E0B\u7DDA\u5DF2\u767C\u9001
+
+organ_error_code_001=\u5DF2\u5206\u914D\u89D2\u8272\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_002=\u5B58\u5728\u4E0B\u7D1A\u6A5F\u6784\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_003=\u5B58\u5728\u4E0B\u7D1A\u6295\u8CC7\u8005\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_004=\u6709\u5269\u9918\u8CC7\u91D1\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_005=\u6709\u5269\u9918\u6301\u5009\uFF0C\u7121\u6CD5\u8A3B\u92B7
+organ_error_code_006=\u8B49\u4EF6\u865F\u78BC\u5DF2\u5B58\u5728\u6B63\u5E38\u8A18\u9304\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_007=\u624B\u6A5F\u865F\u5DF2\u5B58\u5728\u6B63\u5E38\u8A18\u9304\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_008=\u4E0A\u7D1A\u6A5F\u6784\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_009=\u6240\u5C6C\u6703\u54E1\u6C92\u6709\u7D93\u7D00\u89D2\u8272\uFF0C\u7121\u6CD5\u6062\u5FA9
+organ_error_code_010=\u7A0B\u5F0F\u78BC\u6216\u6A5F\u6784\u7A0B\u5F0F\u78BC\u91CD\u8907
+organ_error_code_011=\u8B49\u4EF6\u865F\u78BC\u5DF2\u5B58\u5728
+organ_error_code_012=\u8B49\u4EF6\u865F\u78BC\u5DF2\u5B58\u5728\u9ED1\u540D\u55AE\u4E2D\uFF0C\u4E0D\u80FD\u958B\u6236
+organ_error_code_013=\u540D\u7A31\u5DF2\u5B58\u5728
+organ_error_code_014=\u7BA1\u7406\u54E1\u767B\u9304\u5E33\u865F\u91CD\u8907
+organ_error_code_015=\u65B0\u589E\u5931\u6557\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1
+organ_error_code_016=\u624B\u6A5F\u865F\u5DF2\u5B58\u5728
+organ_error_code_017=\u4F01\u696D\u540D\u7A31\u5DF2\u5B58\u5728
+organ_error_code_018=\u8A72\u6A5F\u6784\u8CC7\u8A0A\u5DF2\u8B8A\u66F4\uFF0C\u8ACB\u91CD\u7E6A\u6578\u64DA
+organ_error_code_019=\u8B49\u4EF6\u865F\u78BC\u6216\u624B\u6A5F\u865F\u5DF2\u5B58\u5728
+organ_error_code_020=\u7A3D\u6838\u62D2\u7D55\u539F\u56E0\u4E0D\u80FD\u8D85\u904E80\u500B\u5B57
+organ_error_code_021=\u8A72\u6295\u8CC7\u8005\u8CC7\u8A0A\u5DF2\u8B8A\u66F4\uFF0C\u8ACB\u91CD\u7E6A\u6578\u64DA
+organ_error_code_022=\u975E\u5F85\u7A3D\u6838\u72C0\u614B\uFF0C\u7121\u6CD5\u64A4\u56DE
+organ_error_code_023=\u6240\u5C6C\u6703\u54E1\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u7A3D\u6838\u901A\u904E
+organ_error_code_024=\u6240\u5C6C\u6A5F\u6784\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u7A3D\u6838\u901A\u904E
+organ_error_code_025=\u6240\u5C6C\u7D93\u7D00\u4EBA\u70BA\u975E\u6B63\u5E38\u72C0\u614B\uFF0C\u7121\u6CD5\u7A3D\u6838\u901A\u904E
+organ_error_code_026=\u5B58\u5728\u4E0B\u7D1A\u7D93\u7D00\u6703\u54E1\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_027=\u5B58\u5728\u4E0B\u7D1A\u5009\u5EAB\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_028=\u505A\u5E02\u6703\u54E1\u5DF2\u7C3D\u7D04\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_029=\u505A\u5E02\u6703\u54E1\u662F\u9ED8\u8A8D\u5831\u50F9\u5546\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_030=\u505A\u5E02\u6703\u54E1\u5DF2\u914D\u5BD8\u4E8C\u7D1A\u5C0D\u624B\u95DC\u4FC2\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_031=\u505A\u5E02\u6703\u54E1\u88AB\u5834\u5916\u671F\u6B0A\u505A\u5E02\u5F15\u7528\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_032=\u5B58\u5728\u7A4D\u5206\u985E\u578B\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_033=\u5831\u50F9\u6A5F\u6784\u88AB\u5F15\u7528\uFF0C\u7121\u6CD5\u5220\u9664
+organ_error_code_034=\u4E0A\u7D1A\u4E0D\u80FD\u70BA\u81EA\u5DF1
+organ_error_code_035=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u65BC100
+
+
+profit_shar_error_code_001=\u8ACB\u5148\u5220\u9664\u5206\u6F64\u914D\u5BD8
+profit_shar_error_code_002=\u8ACB\u5148\u5220\u9664\u5206\u7D44\u4EBA\u54E1
+profit_shar_error_code_003=\u8A72\u8CBB\u7528\u985E\u578B\u5DF2\u5B58\u5728\u5206\u6F64\u914D\u5BD8
+
+query_error_code_001=\u8ACB\u9078\u64C7\u5E02\u5834\u67FB\u8A62
+query_error_code_002=\u6B77\u53F2\u67FB\u8A62\u8ACB\u9078\u64C7\u958B\u59CB\u65E5\u671F
+query_error_code_003=\u6B77\u53F2\u67FB\u8A62\u8ACB\u9078\u64C7\u7D50\u675F\u65E5\u671F
+query_error_code_004=\u6C92\u6709\u6B64\u8A31\u53EF\u6B0A
+query_error_code_005=\u7121\u6578\u64DA\u53EF\u532F\u51FA
+query_error_code_006=\u532F\u51FA\u5931\u6557\uFF0C\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\uFF01
+query_error_code_007=\u8ACB\u8F38\u5165\u8CC7\u91D1\u5E33\u6236
+query_error_code_008=\u5E02\u5834\u932F\u8AA4\u6216\u72C0\u614B\u4E0D\u70BA\u958B\u5E02\u72C0\u614B
+query_error_code_009=\u53C3\u6578\u932F\u8AA4
+query_error_code_010=\u5C0E\u5165\u6A94\u6848\u70BA\u7A7A
+
+report_error_code_001=\u8D77\u59CB\u4EA4\u6613\u65E5{0},\u7D50\u675F\u4EA4\u6613\u65E5{1}\u57F7\u884C\u5831\u8868\u91CD\u65B0\u7D71\u8A08\u51FA\u932F
+
+settlement_message_001=\u78BA\u8A8D\u4ED8\u6B3E\u5B8C\u6210:{0}\u689D\u6210\u529F,{1}\u689D\u5931\u6557
+settlement_message_002=\u6578\u64DA\u6709\u8B8A\u66F4\uFF0C\u8ACB\u91CD\u7E6A\u91CD\u8A66
+
+pwd_error_code_001=\u8ACB\u586B\u5BEB\u820A\u5BC6\u78BC
+pwd_error_code_002=\u8ACB\u586B\u5BEB\u65B0\u5BC6\u78BC
+pwd_error_code_003=\u8ACB\u586B\u5BEB\u65B0\u5BC6\u78BC\u78BA\u8A8D
+pwd_error_code_004=\u5169\u6B21\u5BC6\u78BC\u4E0D\u4E00\u81F4
+pwd_error_code_005=\u820A\u5BC6\u78BC\u932F\u8AA4
+
+amount_error_code_001=\u91D1\u984D\u70BA0\uFF0C\u4E0D\u505A\u8655\u7406\uFF01
+
+traAcc_error_code_001=\u767B\u5165\u5E33\u6236\u91CD\u8907\uFF0C\u8ACB\u9EDE\u64CA\u91CD\u65B0\u751F\u5B58\u4E26\u518D\u6B21\u63D0\u4EA4!
+
+investor_error_code_001=\u6C92\u6709\u627E\u5230\u8CC7\u91D1\u5E33\u6236
+investor_error_code_002=\u975E\u6295\u8CC7\u8005\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838.
+investor_error_code_003=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236.
+investor_error_code_004=\u5E33\u6236\u5B58\u5728\u8CC7\u91D1\u3001\u6301\u5009\u7B49\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u4E0D\u80FD\u8A3B\u92B7.
+investor_error_code_005=\u8CC7\u91D1\u5E33\u6236\u8ACB\u6C42\u6C92\u6709\u56DE\u61C9.
+investor_error_code_006=\u5206\u7D44\u540D\u91CD\u8907.
+investor_error_code_007=\u8ACB\u9078\u64C7\u6295\u8CC7\u8005.
+investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7D44.
+investor_error_code_009=\u8ACB\u5148\u79FB\u9664\u8A72\u5206\u7D44\u4E0B\u6240\u6709\u6295\u8CC7\u8005.
+investor_error_code_010=\u8ACB\u5148\u5220\u9664\u8A72\u5206\u7D44\u7684\u500B\u6027\u5316\u8A2D\u5B9A.
+investor_error_code_011=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u65BC10000
+
+warehouse_error_code_01=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u6700\u591A10\u6BD4\u7279
+warehouse_error_code_02=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u91CD\u8907
+warehouse_error_code_03=\u5009\u5EAB\u540D\u7A31\u91CD\u8907
+warehouse_error_code_04=\u6578\u64DA\u932F\u8AA4\uFF1A\u6A5F\u6784\u6578\u64DA\u7F3A\u5931
+warehouse_error_code_05=\u8A72\u5009\u5EAB\u5DF2\u95DC\u806F\u73FE\u8CA8\u54C1\u7A2E\uFF0C\u4E0D\u80FD\u8A3B\u92B7
+
+message_notice_error_code_01=\u8ACB\u81F3\u5C11\u9078\u64C7\u4E00\u500B\u6703\u54E1\uFF01
+message_notice_error_code_02=\u672A\u627E\u5230\u6703\u54E1\uFF01\uFF01\uFF01

+ 6 - 0
mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/MessageType.java

@@ -31,6 +31,9 @@ public enum MessageType {
     MESSAGE_CODE_SYSTEM025("message_code_system025", "非交易商账户,不能销户审核"),
     MESSAGE_CODE_SYSTEM026("message_code_system026", "资金账户未解约,不能销户"),
     MESSAGE_CODE_SYSTEM027("message_code_system027", "还剩{0}次错误机会,账号或密码不匹配达到{1}次,登录账号将锁定{2}分钟{3}"),
+    MESSAGE_CODE_SYSTEM028("message_code_system028", "黑名单已有此证件"),
+    MESSAGE_CODE_SYSTEM029("message_code_system029", "IP地址不能为空值"),
+    MESSAGE_CODE_SYSTEM030("message_code_system030", "IP地址重复"),
 
     MESSAGE_ERROR_CODE_SYSTEM001("message_error_code_system001", "令牌失效,请重新登录!"),
     MESSAGE_ERROR_CODE_SYSTEM002("message_error_code_system002", "操作失败"),
@@ -149,6 +152,9 @@ public enum MessageType {
     WAREHOUSE_ERROR_CODE_03("warehouse_error_code_03", "仓库名称重复."),
     WAREHOUSE_ERROR_CODE_04("warehouse_error_code_04", "数据错误:机构数据缺失."),
     WAREHOUSE_ERROR_CODE_05("warehouse_error_code_05", "该仓库已关联现货品种,不能注销."),
+
+    MESSAGE_NOTICE_ERROR_CODE_01("message_notice_error_code_01", "请至少选择一个会员!"),
+    MESSAGE_NOTICE_ERROR_CODE_02("message_notice_error_code_02", "未找到会员!"),
     ;
 
     private String code;

+ 16 - 0
mtp3-common/src/main/java/com/muchinfo/mtp3common/utils/CommonUtil.java

@@ -666,4 +666,20 @@ public class CommonUtil {
         }
         return shortBuffer.toString();
     }
+
+    //隐藏手机号 131****1111
+    public static String unViewMobile(String str){
+        // 兼容国外手机号处理
+        // #6686 【交易中心-管理端】客户端注册时手机号加了地区号的情况下交易商名称没有完整显示手机尾号
+        if(str == null || StringUtils.isBlank(str) || str.length() < 11){
+            return str;
+        }else{
+            // 超过11位时,统一前3+****+后4
+            StringBuffer sb = new StringBuffer();
+            sb.append(str.substring(0,3));
+            sb.append("****");
+            sb.append(str.substring(str.length() -4));
+            return sb.toString();
+        }
+    }
 }

+ 16 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IGzMemberinfoMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.GzMemberinfo;
+
+/**
+ * <p>
+ * 会员风采表\资讯来源表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-27
+ */
+public interface IGzMemberinfoMapper extends BaseMapper<GzMemberinfo> {
+
+}

+ 16 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IMemberrecvMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Memberrecv;
+
+/**
+ * <p>
+ * 会员消息接受表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-25
+ */
+public interface IMemberrecvMapper extends BaseMapper<Memberrecv> {
+
+}

+ 16 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IMsgreceiverMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Msgreceiver;
+
+/**
+ * <p>
+ * 管理端消息接收者 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-25
+ */
+public interface IMsgreceiverMapper extends BaseMapper<Msgreceiver> {
+
+}

+ 28 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/INoticemsgMapper.java

@@ -0,0 +1,28 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.muchinfo.mtp3pojos.entity.Noticemsg;
+import com.muchinfo.mtp3pojos.vo.notice.*;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 公告消息表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-25
+ */
+public interface INoticemsgMapper extends BaseMapper<Noticemsg> {
+
+    IPage<NoticeMsgQueryResult> query(IPage<NoticeMsgQueryResult> page,@Param("vo") NoticeMsgQueryParam param);
+
+    IPage<SmsQueryResult> smsquery(IPage<SmsQueryResult> page,@Param("vo") SmsQueryParam param);
+
+    IPage<ColumnQueryResult> columnquery(IPage<ColumnQueryResult> page,@Param("vo") ColumnQueryParam param);
+
+    IPage<ColumnSourceQueryResult> columnsourcequery(IPage<ColumnSourceQueryResult> page,@Param("smembername") String smembername);
+
+    IPage<InforManQueryResult> informManquery(IPage<InforManQueryResult> page,@Param("vo") InforManQueryParam param);
+}

+ 17 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISiteColumnconfigMapper.java

@@ -0,0 +1,17 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.SiteColumnconfig;
+
+/**
+ * <p>
+ * 栏目配置表 - 前999预留,序列从1000开始
+1. 新闻资讯 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-26
+ */
+public interface ISiteColumnconfigMapper extends BaseMapper<SiteColumnconfig> {
+
+}

+ 16 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISiteColumndetailMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.SiteColumndetail;
+
+/**
+ * <p>
+ * 栏目明细表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-03-03
+ */
+public interface ISiteColumndetailMapper extends BaseMapper<SiteColumndetail> {
+
+}

+ 16 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISmscollectionMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Smscollection;
+
+/**
+ * <p>
+ * 短信发送表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-26
+ */
+public interface ISmscollectionMapper extends BaseMapper<Smscollection> {
+
+}

+ 16 - 0
mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISmsparametersMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Smsparameters;
+
+/**
+ * <p>
+ * 短信参数 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-26
+ */
+public interface ISmsparametersMapper extends BaseMapper<Smsparameters> {
+
+}

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

@@ -7,10 +7,7 @@ import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunLoginUserResult;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountOrgan2UserResult;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountSelfsupportParam;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountSelfsupportResult;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorResult;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogParam;
-import com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogResult;
+import com.muchinfo.mtp3pojos.vo.systemsetup.*;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserReqParam;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserResResult;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,4 +43,6 @@ public interface ISystemmanagerMapper extends BaseMapper<Systemmanager> {
     void updateorgan2User(@Param("userid") Long userid, @Param("status") Integer status);
 
     IPage<UserAccountSelfsupportResult> queryselfsupport(IPage<UserAccountSelfsupportResult> page, @Param("vo") UserAccountSelfsupportParam param);
+
+    IPage<YmrslQueryResult> querymrsl(IPage<YmrslQueryResult> page,@Param("vo")  YmrslQueryParam param);
 }

+ 74 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/GzMemberinfo.java

@@ -0,0 +1,74 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会员风采表\资讯来源表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("GZ_MEMBERINFO")
+@ApiModel(value="GzMemberinfo对象", description="会员风采表资讯来源表")
+@KeySequence(value = "SEQ_GZ_MEMBERINFO")
+public class GzMemberinfo extends Model<GzMemberinfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "会员ID(SEQ_GZ_MEMBERINFO)")
+    @TableId(value = "MEMBERID", type = IdType.INPUT)
+    private Long memberid;
+
+    @ApiModelProperty(value = "会员名称来源名称")
+    @TableField("MEMBERNAME")
+    private String membername;
+
+    @ApiModelProperty(value = "联系人")
+    @TableField("CONTACTNAME")
+    private String contactname;
+
+    @ApiModelProperty(value = "电话")
+    @TableField("CONTACTPHONE")
+    private String contactphone;
+
+    @ApiModelProperty(value = "微信号")
+    @TableField("CONTACTWX")
+    private String contactwx;
+
+    @ApiModelProperty(value = "标签(逗号分隔)来源网址")
+    @TableField("MEMBERTAGS")
+    private String membertags;
+
+    @ApiModelProperty(value = "图片地址来源LOGO")
+    @TableField("IMAGEURL")
+    private String imageurl;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATETIME")
+    private Date updatetime;
+
+    @ApiModelProperty(value = "显示顺序")
+    @TableField("ORDERINDEX")
+    private Integer orderindex;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.memberid;
+    }
+
+}

+ 47 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Memberrecv.java

@@ -0,0 +1,47 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 会员消息接受表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("MEMBERRECV")
+@ApiModel(value="Memberrecv对象", description="会员消息接受表")
+public class Memberrecv extends Model<Memberrecv> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "消息ID")
+    private Long msgid;
+
+    @ApiModelProperty(value = "会员用户ID")
+    @TableField("MEMBERID")
+    private Long memberid;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.msgid;
+    }
+
+}

+ 60 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Msgreceiver.java

@@ -0,0 +1,60 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 管理端消息接收者
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("MSGRECEIVER")
+@ApiModel(value="Msgreceiver对象", description="管理端消息接收者")
+public class Msgreceiver extends Model<Msgreceiver> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "消息ID")
+    private Long autoid;
+
+    @ApiModelProperty(value = "用户ID")
+    @TableField("MANAGERID")
+    private Long managerid;
+
+    @ApiModelProperty(value = "消息状态 - 1:未阅读 2:已阅读 3:已删除")
+    @TableField("READSTATUS")
+    private Integer readstatus;
+
+    @ApiModelProperty(value = "接收用户类型 - 1:管理端用户 2:终端用户")
+    @TableField("RECEIVERTYPE")
+    private Integer receivertype;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATETIME")
+    private Date updatetime;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.autoid;
+    }
+
+}

+ 118 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Noticemsg.java

@@ -0,0 +1,118 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 公告消息表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("NOTICEMSG")
+@ApiModel(value="Noticemsg对象", description="公告消息表")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@KeySequence(value = "SEQ_NOTICEMSG")
+public class Noticemsg extends Model<Noticemsg> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "自增ID")
+    @TableId(value = "AUTOID", type = IdType.INPUT)
+    private Long autoid;
+
+    @ApiModelProperty(value = "消息类型 - 1:公告通知 2:系统消息 3:商品到期提货通知")
+    @TableField("MSGTYPE")
+    private Integer msgtype;
+
+    @ApiModelProperty(value = "标题")
+    @TableField("TITLE")
+    private String title;
+
+    @ApiModelProperty(value = "内容")
+    @TableField("CONTENT")
+    private String content;
+
+    @ApiModelProperty(value = "计划发送时间")
+    @TableField("SCHEDULETIME")
+    private Date scheduletime;
+
+    @ApiModelProperty(value = "消息发布者")
+    @TableField("PUBLISHER")
+    private String publisher;
+
+    @ApiModelProperty(value = "推送方式 - 1:全体广播 2:按会员广播 3:个人推送 4:按会员广播(仅会员)")
+    @TableField("SENDTYPE")
+    private Integer sendtype;
+
+    @ApiModelProperty(value = "会员/投资者ID 推送方式 为 个人时,填写投资者ID")
+    @TableField("USERID")
+    private Long userid;
+
+    @ApiModelProperty(value = "是否置顶 - 0:不置顶 1:置顶")
+    @TableField("ISTOP")
+    private Integer istop;
+
+    @ApiModelProperty(value = "推送状态 - 0:未推送 1:已推送 2:审核拒绝 3:提前失效")
+    @TableField("SENTSTATUS")
+    private Integer sentstatus;
+
+    @ApiModelProperty(value = "结束时间")
+    @TableField("ENDTIME")
+    private Date endtime;
+
+    @ApiModelProperty(value = "建仓人")
+    @TableField("CREATORID")
+    private Long creatorid;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATETIME")
+    private Date createtime;
+
+    @ApiModelProperty(value = "审核人")
+    @TableField("AUDITORUSERID")
+    private Long auditoruserid;
+
+    @ApiModelProperty(value = "审核日期")
+    @TableField("AUDITTIME")
+    private Date audittime;
+
+    @ApiModelProperty(value = "审核备注")
+    @TableField("AUDITREMARK")
+    private String auditremark;
+
+    @ApiModelProperty(value = "消息图标Url")
+    @TableField("MSGICONURL")
+    private String msgiconurl;
+
+    @ApiModelProperty(value = "是否强制显示 - 0:不强制 1:强制")
+    @TableField("ISFORCEDISPLAY")
+    private Integer isforcedisplay;
+
+    @TableField(select = false)
+    private String creatorName;
+    @TableField(select = false)
+    private String auditName;
+    @TableField(select = false)
+    private String membername;
+
+    @Override
+    public Serializable pkVal() {
+        return this.autoid;
+    }
+
+}

+ 79 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/SiteColumnconfig.java

@@ -0,0 +1,79 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 栏目配置表 - 前999预留,序列从1000开始
+1. 新闻资讯
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SITE_COLUMNCONFIG")
+@ApiModel(value="SiteColumnconfig对象", description="栏目配置表 - 前999预留,序列从1000开始 1. 新闻资讯")
+@KeySequence(value = "SEQ_SITE_COLUMNCONFIG")
+public class SiteColumnconfig extends Model<SiteColumnconfig> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID(SEQ_SITE_COLUMNCONFIG)")
+    @TableId(value = "ID", type = IdType.INPUT)
+    private Long id;
+
+    @ApiModelProperty(value = "栏目类型 - 1:行情资讯 10:会员服务 30:关于我们 100:核心企业栏目-百色")
+    @TableField("COLUMNTYPE")
+    private Integer columntype;
+
+    @ApiModelProperty(value = "栏目名称")
+    @TableField("COLUMNNAME")
+    private String columnname;
+
+    @ApiModelProperty(value = "排序")
+    @TableField("SORT")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否展示 - 0:不展示 1:展示")
+    @TableField("ISSHOW")
+    private Integer isshow;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREAEDATE")
+    private Date creaedate;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("CREATORID")
+    private Long creatorid;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("UPDATEDATE")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "操作人")
+    @TableField("MODIFIERID")
+    private Long modifierid;
+
+    @TableField(select = false)
+    private String modifieruser;
+    @TableField(select = false)
+    private String creatoruser;
+
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 123 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/SiteColumndetail.java

@@ -0,0 +1,123 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 栏目明细表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SITE_COLUMNDETAIL")
+@ApiModel(value="SiteColumndetail对象", description="栏目明细表")
+@KeySequence(value = "SEQ_SITE_COLUMNCONFIG")
+public class SiteColumndetail extends Model<SiteColumndetail> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID(SEQ_SITE_COLUMNDETAIL)")
+    @TableId(value = "ID", type = IdType.INPUT)
+    private Long id;
+
+    @ApiModelProperty(value = "所属栏目")
+    @TableField("COLUMNID")
+    private Long columnid;
+
+    @ApiModelProperty(value = "用户ID(默认为0, 核心为为机构用户ID)")
+    @TableField("USERID")
+    private Long userid;
+
+    @ApiModelProperty(value = "标题")
+    @TableField("TITLE")
+    private String title;
+
+    @ApiModelProperty(value = "封面图片")
+    @TableField("COVERIMAGE")
+    private String coverimage;
+
+    @ApiModelProperty(value = "作者")
+    @TableField("AUTHOR")
+    private String author;
+
+    @ApiModelProperty(value = "简介")
+    @TableField("BRIEF")
+    private String brief;
+
+    @ApiModelProperty(value = "内容")
+    @TableField("CONTEXT")
+    private String context;
+
+    @ApiModelProperty(value = "状态 - 1:暂存 10:待审核 20:审核通过 30:审核拒绝")
+    @TableField("STATUS")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否置顶 - 0:不置 1:置顶")
+    @TableField("ISTOP")
+    private Integer istop;
+
+    @ApiModelProperty(value = "点击数")
+    @TableField("HITS")
+    private Long hits;
+
+    @ApiModelProperty(value = "发布日期")
+    @TableField("PUBLISHDATE")
+    private Date publishdate;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREAEDATE")
+    private Date creaedate;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("CREATORID")
+    private Long creatorid;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("UPDATEDATE")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "操作人")
+    @TableField("MODIFIERID")
+    private Long modifierid;
+
+    @ApiModelProperty(value = "是否展示 - 0:不展示 1:展示")
+    @TableField("ISSHOW")
+    private Integer isshow;
+
+    @ApiModelProperty(value = "来源ID")
+    @TableField("SRCID")
+    private Long srcid;
+
+    @TableField(select = false)
+    private String srcname;
+    @TableField(select = false)
+    private String columnname;
+    @TableField(select = false)
+    private String creatoruser;
+    @TableField(select = false)
+    private String modifieruser;
+    @TableField(select = false)
+    private String publishdate2;
+    @TableField(select = false)
+    private Integer columntype;
+
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 87 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Smscollection.java

@@ -0,0 +1,87 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 短信发送表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SMSCOLLECTION")
+@ApiModel(value="Smscollection对象", description="短信发送表")
+public class Smscollection extends Model<Smscollection> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "消息编号")
+    private Long msgid;
+
+    @ApiModelProperty(value = "模板ID")
+    @TableField("TEMPLID")
+    private Long templid;
+
+    @ApiModelProperty(value = "消息类型")
+    @TableField("MSGTYPE")
+    private Integer msgtype;
+
+    @ApiModelProperty(value = "发送状态 - 1:待发送 0\3:已发送 -1\4:发送失败")
+    @TableField("STATUS")
+    private Integer status;
+
+    @ApiModelProperty(value = "错误信息")
+    @TableField("ERRINFO")
+    private String errinfo;
+
+    @ApiModelProperty(value = "优先级别 - 1:正常 2:加急 3:紧急")
+    @TableField("PRIORITY")
+    private Integer priority;
+
+    @ApiModelProperty(value = "FailedPhone")
+    @TableField("FAILEDPHONE")
+    private String failedphone;
+
+    @ApiModelProperty(value = "接收手机号")
+    @TableField("RECVPHONE")
+    private String recvphone;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATETIME")
+    private Date createtime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATETIME")
+    private Date updatetime;
+
+    @ApiModelProperty(value = "数据是否已加密 - 0:未加密 1:已加密")
+    @TableField("HASENCRYPT")
+    private Integer hasencrypt;
+
+    @ApiModelProperty(value = "短信内容(加密存储)")
+    @TableField("MSGCONTENT")
+    private String msgcontent;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.msgid;
+    }
+
+}

+ 50 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Smsparameters.java

@@ -0,0 +1,50 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 短信参数
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SMSPARAMETERS")
+@ApiModel(value="Smsparameters对象", description="短信参数")
+public class Smsparameters extends Model<Smsparameters> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "短信ID")
+    private Long msgid;
+
+    @ApiModelProperty(value = "参数序号")
+    @TableField("OFFSET")
+    private Integer offset;
+
+    @ApiModelProperty(value = "参数")
+    @TableField("PARAM")
+    private String param;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.msgid;
+    }
+
+}

+ 3 - 5
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/WskhBlacklist.java

@@ -1,9 +1,6 @@
 package com.muchinfo.mtp3pojos.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,6 +27,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@KeySequence(value = "SEQ_WSKH_BLACKLIST")
 public class WskhBlacklist extends Model<WskhBlacklist> {
 
     private static final long serialVersionUID = 1L;
@@ -51,7 +49,7 @@ public class WskhBlacklist extends Model<WskhBlacklist> {
 
     @ApiModelProperty(value = "操作员ID")
     @TableField("OPERATORID")
-    private BigDecimal operatorid;
+    private Long operatorid;
 
 
     @Override

+ 27 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnAddParam.java

@@ -0,0 +1,27 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "ColumnAddParam对象", description = "资讯栏目新增")
+public class ColumnAddParam {
+
+    @ApiModelProperty(value = "栏目类型")
+    private Integer columntype;
+
+    @ApiModelProperty(value = "栏目名称")
+    private String columnname;
+
+    @ApiModelProperty(value = "是否展示")
+    private Integer isshow;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    private Long id;
+}

+ 29 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnQueryParam.java

@@ -0,0 +1,29 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "ColumnQueryParam对象", description = "资讯栏目")
+public class ColumnQueryParam {
+
+    @ApiModelProperty(value = "栏目类型")
+    private Integer columntype;
+
+    @ApiModelProperty(value = "栏目名称")
+    private String columnname;
+
+    @ApiModelProperty(value = "是否展示")
+    private Integer isshow;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

+ 37 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnQueryResult.java

@@ -0,0 +1,37 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "ColumnQueryResult对象", description = "资讯栏目响应")
+public class ColumnQueryResult {
+
+    @ApiModelProperty(value = "栏目名称")
+    private String columnname;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否展示")
+    private Integer isshow;
+
+    @ApiModelProperty(value = "创建人")
+    private String creatoruser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date creaedate;
+
+    private Long creatorid;
+
+    private String id;
+}

+ 27 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnSourceAddParam.java

@@ -0,0 +1,27 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "ColumnSourceAddParam对象", description = "资讯来源新增")
+public class ColumnSourceAddParam {
+
+    @ApiModelProperty(value = "来源名称")
+    private String membername;
+
+    @ApiModelProperty(value = "来源网址")
+    private String membertags;
+
+    @ApiModelProperty(value = "来源LOGO")
+    private String imageurl;
+
+    private Long memberid;
+}

+ 27 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnSourceQueryResult.java

@@ -0,0 +1,27 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "ColumnSourceQueryResult对象", description = "资讯来源响应")
+public class ColumnSourceQueryResult {
+
+    @ApiModelProperty(value = "来源LOGO")
+    private String imageurl;
+
+    @ApiModelProperty(value = "来源名称")
+    private String membername;
+
+    @ApiModelProperty(value = "来源网址")
+    private String membertags;
+
+    private String memberid;
+}

+ 34 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/InforManQueryParam.java

@@ -0,0 +1,34 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "InforManQueryParam对象", description = "资讯管理")
+public class InforManQueryParam {
+
+    @ApiModelProperty(value = "类型")
+    private Long columnid;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "是否展示")
+    private Integer isshow;
+
+    private Long userid;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

+ 50 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/InforManQueryResult.java

@@ -0,0 +1,50 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "InforManResultParam对象", description = "资讯管理响应")
+public class InforManQueryResult {
+
+    @ApiModelProperty(value = "资讯类型")
+    private String columnname;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "来源")
+    private String srcname;
+
+    @ApiModelProperty(value = "作者")
+    private String author;
+
+    @ApiModelProperty(value = "是否置顶")
+    private Integer istop;
+
+    @ApiModelProperty(value = "是否展示")
+    private Integer isshow;
+
+    @ApiModelProperty(value = "发布日期")
+    private String publishdate;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建人")
+    private String creatoruser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date creaedate;
+
+    private Long id;
+}

+ 26 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/InformManinitMessage.java

@@ -0,0 +1,26 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+import com.muchinfo.mtp3pojos.entity.GzMemberinfo;
+import com.muchinfo.mtp3pojos.entity.SiteColumnconfig;
+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.List;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "InformManinitMessage对象", description = "初始化列表信息")
+public class InformManinitMessage {
+
+    @ApiModelProperty(value = "所属栏目列表")
+    private List<SiteColumnconfig> siteColumnconfig;
+
+    @ApiModelProperty(value = "来源列表")
+    private List<GzMemberinfo> gzMemberinfo;
+}

+ 42 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/NoticeMsgAddParam.java

@@ -0,0 +1,42 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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.List;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "NoticeMsgAddParam对象", description = "发布通知公告")
+public class NoticeMsgAddParam {
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "消息类型")
+    private Integer sendtype;
+
+    @ApiModelProperty(value = "发布类型")
+    private Integer msgtype;
+
+    @ApiModelProperty(value = "接收交易商")
+    private Long invertorID;
+
+    @ApiModelProperty(value = "生效时间")
+    private String scheduletime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endtime;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "会员集合")
+    private String memberidlist;
+}

+ 40 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/NoticeMsgQueryParam.java

@@ -0,0 +1,40 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "NoticeMsgQueryParam对象", description = "公告通知管理")
+public class NoticeMsgQueryParam {
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "消息类型")
+    private Integer msgtype;
+
+    @ApiModelProperty(value = "消息内容")
+    private String content;
+
+    @ApiModelProperty(value = "接收交易商")
+    private Long userid;
+
+    @ApiModelProperty(value = "发布类型")
+    private Integer sendtype;
+
+    @ApiModelProperty(value = "是否强制弹出")
+    private Integer isforcedisplay;
+
+    private String publisher;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

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

@@ -0,0 +1,42 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "NoticeMsgQueryResult对象", description = "公告通知管理响应")
+public class NoticeMsgQueryResult {
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "消息类型")
+    private Integer msgtype;
+
+    @ApiModelProperty(value = "发布类型")
+    private Integer sendtype;
+
+    @ApiModelProperty(value = "推送状态")
+    private Integer sentstatus;
+
+    @ApiModelProperty(value = "生效时间")
+    private Date scheduletime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endtime  ;
+
+    @ApiModelProperty(value = "接收人")
+    private String recipient;
+
+    private Long autoid;
+
+}

+ 33 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/SmsQueryParam.java

@@ -0,0 +1,33 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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.Set;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "SmsQueryParam对象", description = "短线查询")
+public class SmsQueryParam {
+
+    @ApiModelProperty(value = "接收手机号")
+    private String recvphone;
+
+    @ApiModelProperty(value = "发送状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "敏感词权限")
+    private Set<String> sensitive;
+
+    private Long userid;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

+ 37 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/SmsQueryResult.java

@@ -0,0 +1,37 @@
+package com.muchinfo.mtp3pojos.vo.notice;
+
+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 = "SmsQueryResult对象", description = "短线查询响应")
+public class SmsQueryResult {
+
+    @ApiModelProperty(value = "接收手机号")
+    private String recvphone;
+
+    @ApiModelProperty(value = "消息模板")
+    private String tempname;
+
+    @ApiModelProperty(value = "发送状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "错误信息")
+    private String errinfo;
+
+    @ApiModelProperty(value = "发送时间")
+    private Date createtime;
+
+    private Long msgid;
+
+    private String failedphone;
+}

+ 24 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/BlackListAddParam.java

@@ -0,0 +1,24 @@
+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 = "BlackListAddParam对象", description = "开户黑名单管理")
+public class BlackListAddParam {
+
+    private Long autoid;
+
+    @ApiModelProperty(value = "证件类型")
+    private Integer cardtype;
+
+    @ApiModelProperty(value = "证件号码")
+    private String cardnum;
+}

+ 22 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/IpListDelParam.java

@@ -0,0 +1,22 @@
+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 = "IpListAddParam对象", description = "IP黑名单管理")
+public class IpListDelParam {
+
+    @ApiModelProperty(value = "Ip地址")
+    private String ip;
+
+    @ApiModelProperty(value = "IP类型")
+    private Integer iptype;
+}

+ 28 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/YmrslQueryParam.java

@@ -0,0 +1,28 @@
+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 = "YmrslQueryParam对象", description = "系统服务运行日志")
+public class YmrslQueryParam {
+
+    @ApiModelProperty(value = "交易日")
+    private String tradedate;
+
+    @ApiModelProperty(value = "市场")
+    private Long marketid;
+
+    @ApiModelProperty(value = "* 页码 *")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "* 页大小 *")
+    private Integer pageSize;
+}

+ 31 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/YmrslQueryResult.java

@@ -0,0 +1,31 @@
+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 = "YmrslQueryResult对象", description = "系统服务运行日志响应")
+public class YmrslQueryResult {
+
+    @ApiModelProperty(value = "交易日")
+    private String tradedate;
+
+    @ApiModelProperty(value = "时间")
+    private String updatetime;
+
+    @ApiModelProperty(value = "服务模块")
+    private String marketname;
+
+    @ApiModelProperty(value = "运行类型")
+    private String runstatus;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}