新增接口

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

@@ -142,7 +142,7 @@ public class SystemSetUpController {
 
     @ApiOperation("基础数据管理-->网上开户配置-->保存")
     @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/oaconfigAdd")
+    @RequestMapping(method = RequestMethod.POST, value = "/oaconfigAdd")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     private AjaxResult oaconfigAdd(@RequestBody OaConfigParam param, HttpServletRequest request) {
         return iSystemSetUpService.oaconfigAdd(param, request);
@@ -187,4 +187,100 @@ public class SystemSetUpController {
     private AjaxResult deleteDiv(HttpServletRequest request, Long areaid) {
         return iSystemSetUpService.deleteDiv(request, areaid);
     }
+
+    @ApiOperation("基础数据管理-->系统设置-->同步开户信息")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/syncTaToCenter")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult syncTaToCenter(HttpServletRequest request) {
+        return iSystemSetUpService.syncTaToCenter(request);
+    }
+
+    @ApiOperation("基础数据管理-->系统设置-->更新交易权限")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/updateTransaction")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult updateTransaction(HttpServletRequest request) {
+        return iSystemSetUpService.updateTransaction(request);
+    }
+
+    @ApiOperation("基础数据管理-->系统设置-->详情")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/initdetail")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<SystemSetUpDetail> initdetail(HttpServletRequest request) {
+        return iSystemSetUpService.initdetail(request);
+    }
+
+    @ApiOperation("基础数据管理-->系统设置-->保存")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/update")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult update(@RequestBody SystemSetUpDetail param, HttpServletRequest request) {
+        return iSystemSetUpService.update(request, param);
+    }
+
+    @ApiOperation("基础数据管理-->系统设置-->清空运行时段")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/clearMarketRunPlan")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult clearMarketRunPlan(HttpServletRequest request) {
+        return iSystemSetUpService.clearMarketRunPlan(request);
+    }
+
+    @ApiOperation("基础数据管理-->数据字典管理-->获取树结构")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/getEnumDics")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<EnumDicsResult> getEnumDics(HttpServletRequest request) {
+        return iSystemSetUpService.getEnumDics(request);
+    }
+
+    @ApiOperation("基础数据管理-->数据字典管理-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryEnumDicItemByPage")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private PageResult<EnumDicsPageResult> queryEnumDicItemByPage(EnumDicsPageParam param, HttpServletRequest request) {
+        return iSystemSetUpService.queryEnumDicItemByPage(param, request);
+    }
+
+    @ApiOperation("基础数据管理-->数据字典管理-->获取详情(二级)")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/editEnumDic")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<Enumdic> editEnumDic(Long autoid, Long enumgroupid, HttpServletRequest request) {
+        return iSystemSetUpService.editEnumDic(autoid, enumgroupid, request);
+    }
+
+    @ApiOperation("基础数据管理-->数据字典管理-->新增(二级)")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/saveEnumDic")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult saveEnumDic(@RequestBody Enumdic enumdic, HttpServletRequest request) {
+        return iSystemSetUpService.saveEnumDic(enumdic, request);
+    }
+
+    @ApiOperation("基础数据管理-->数据字典管理-->获取详情(三级)")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/editEnumDicItem")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<EnumdicitemVoResult> editEnumDicItem(Long autoid, Long enumdiccode, Integer ismappingtobank, HttpServletRequest request) {
+        return iSystemSetUpService.editEnumDicItem(autoid, enumdiccode, ismappingtobank, request);
+    }
+
+    @ApiOperation("基础数据管理-->数据字典管理-->新增(三级)")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/updateOrSave")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult updateOrSave(@RequestBody EnumDicItemSave param, HttpServletRequest request) {
+        return iSystemSetUpService.updateOrSave(param, request);
+    }
+
+    @ApiOperation("基础数据管理-->数据字典管理-->删除")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/delEnumdicItem")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult delEnumdicItem(Long autoid, Integer flag, HttpServletRequest request) {
+        return iSystemSetUpService.delEnumdicItem(autoid, flag, request);
+    }
 }

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

@@ -49,4 +49,28 @@ public interface ISystemSetUpService {
     AjaxResult dealDiv(HttpServletRequest request, DivisionAddParam param);
 
     AjaxResult deleteDiv(HttpServletRequest request, Long areaid);
+
+    AjaxResult syncTaToCenter(HttpServletRequest request);
+
+    AjaxResult updateTransaction(HttpServletRequest request);
+
+    AjaxResult<SystemSetUpDetail> initdetail(HttpServletRequest request);
+
+    AjaxResult update(HttpServletRequest request, SystemSetUpDetail param);
+
+    AjaxResult clearMarketRunPlan(HttpServletRequest request);
+
+    AjaxResult<EnumDicsResult> getEnumDics(HttpServletRequest request);
+
+    PageResult<EnumDicsPageResult> queryEnumDicItemByPage(EnumDicsPageParam param, HttpServletRequest request);
+
+    AjaxResult<Enumdic> editEnumDic(Long autoid, Long enumgroupid, HttpServletRequest request);
+
+    AjaxResult<EnumdicitemVoResult> editEnumDicItem(Long autoid, Long enumdiccode, Integer ismappingtobank, HttpServletRequest request);
+
+    AjaxResult saveEnumDic(Enumdic enumdic, HttpServletRequest request);
+
+    AjaxResult updateOrSave(EnumDicItemSave param, HttpServletRequest request);
+
+    AjaxResult delEnumdicItem(Long autoid, Integer flag, HttpServletRequest request);
 }

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

@@ -5,24 +5,35 @@ 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.NotifyMI1;
+import com.muchinfo.mtp.proto.PublicMI1;
 import com.muchinfo.mtp3century.service.ICommonService;
+import com.muchinfo.mtp3century.service.ISendMsgService;
 import com.muchinfo.mtp3century.service.ISystemSetUpService;
 import com.muchinfo.mtp3century.utils.AjaxResult;
 import com.muchinfo.mtp3century.utils.RedisServiceUtil;
 import com.muchinfo.mtp3century.vo.TreeNode;
 import com.muchinfo.mtp3common.enumtype.*;
+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.I18nconfig;
 import com.muchinfo.mtp3pojos.vo.systemsetup.*;
 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.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
@@ -52,6 +63,22 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
     private IWskhOpenaccountconfigMapper iWskhOpenaccountconfigMapper;
     @Resource
     private IDivisionMapper iDivisionMapper;
+    @Resource
+    private IUserinfoMapper iUserinfoMapper;
+    @Resource
+    private ISendMsgService iSendMsgService;
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+    @Resource
+    private IMarketrunstepdetailMapper iMarketrunstepdetailMapper;
+    @Resource
+    private IEnumdicMapper iEnumdicMapper;
+    @Resource
+    private IEnumgroupMapper iEnumgroupMapper;
+    @Resource
+    private IEnumdicitemMapper iEnumdicitemMapper;
+    @Resource
+    private ICertificatetypeconfigMapper iCertificatetypeconfigMapper;
 
     @Override
     public PageResult<Systemparam> queryByPage(Integer pageNum, Integer pageSize, HttpServletRequest request) {
@@ -378,22 +405,367 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
 
     @Override
     public AjaxResult deleteDiv(HttpServletRequest request, Long areaid) {
-        Division area = iDivisionMapper.selectOne(new QueryWrapper<Division>().eq("autoid",areaid));
+        Division area = iDivisionMapper.selectOne(new QueryWrapper<Division>().eq("autoid", areaid));
         // 三级菜单，直接delete
-        if(("district").equals(area.getDivisionlevel()))
-            iDivisionMapper.delete(new QueryWrapper<Division>().eq("autoid",areaid));
+        if (("district").equals(area.getDivisionlevel()))
+            iDivisionMapper.delete(new QueryWrapper<Division>().eq("autoid", areaid));
         // 二级菜单，删除时需先删掉三级菜单      一级菜单，删除时需先删掉二级菜单
-        if(("province").equals(area.getDivisionlevel()) || ("city").equals(area.getDivisionlevel())){
+        if (("province").equals(area.getDivisionlevel()) || ("city").equals(area.getDivisionlevel())) {
             List<Division> aList = iDivisionMapper.selectList(new QueryWrapper<Division>().eq("parentcode", area.getDivisioncode()));
             if (!aList.isEmpty()) {
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM025.getCode(), request.getHeader("Accept-Language"));
-            }else {
-                iDivisionMapper.delete(new QueryWrapper<Division>().eq("autoid",areaid));
+            } else {
+                iDivisionMapper.delete(new QueryWrapper<Division>().eq("autoid", areaid));
+            }
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult syncTaToCenter(HttpServletRequest request) {
+        List<Userinfo> taList = iUserinfoMapper.queryUserinfoTa();
+
+        //发送银行服务同步信息
+        for (Userinfo ta : taList) {
+            if (ta == null) {
+                continue;
+            }
+            try {
+                iSendMsgService.sendCustomerInfo(ta, ta.getAccountid(), "1", 0);
+            } catch (Exception e) {
+                log.error("同步信息发送失败，失败原因：" + e.getMessage());
             }
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
+    @Override
+    public AjaxResult updateTransaction(HttpServletRequest request) {
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        //发送通知
+        NotifyMI1.UpdateUserTradeRightNtf.Builder builder = NotifyMI1.UpdateUserTradeRightNtf.newBuilder();
+        Common.MessageHead.Builder hd = Common.MessageHead.newBuilder();
+        PublicMI1.NotifyHead.Builder nhd = PublicMI1.NotifyHead.newBuilder();
+        nhd.setNtfMode(0);
+        builder.setNtfHeader(nhd);
+        hd.setFunCode(FunCodeConstants.FuncCode_UpdateUserTradeRightNtf);
+        hd.setClientTime(System.currentTimeMillis());
+        builder.setHeader(hd);
+        builder.setNotifyTime(new SimpleDateFormat(DateTimeUtils.DATETIME_PATTERN).format(new Date()));
+        byte[] body = ProtoHelper.getNTAS(builder.build().toByteArray(), FunCodeConstants.FuncCode_UpdateUserTradeRightNtf);
+        rabbitTemplate.send(SysConstants.RabbitNtfKey, new Message(body, new MessageProperties()));
+        //记录操作日志
+        systemmanagerService.writeOperateLog(SysConstants.BUSINESS_SYSTEMSETTING, "更新交易权限", user, null, null, null);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult<SystemSetUpDetail> initdetail(HttpServletRequest request) {
+        SystemSetUpDetail result = new SystemSetUpDetail();
+        List<Systemparam> sysparmList = iSystemparamMapper.selectList(new QueryWrapper<Systemparam>()
+                .in("paramcode", "009", "010", "011", "012", "013", "014"));
+        for (Systemparam sp : sysparmList) {
+            switch (sp.getParamcode()) {
+                case SysConstants.SYSPARAM_SETTING_OPEN_MARKET:
+                    result.setOpenMarket(sp.getParamvalue());
+                    break;
+                case SysConstants.SYSPARAM_SETTING_SETTLEMENT:
+                    result.setSettlement(sp.getParamvalue());
+                    break;
+                case SysConstants.SYSPARAM_SETTING_SIGN_IN:
+                    result.setSignIn(sp.getParamvalue());
+                    break;
+                case SysConstants.SYSPARAM_SETTING_SIGN_OUT:
+                    result.setSignOut(sp.getParamvalue());
+                    break;
+                case SysConstants.SYSPARAM_SETTING_SETTLE_TRADEDAY:
+                    result.setOpenMarketDayType(sp.getParamvalue());
+                    break;
+                case SysConstants.SYSPARAM_SETTING_SYS_CLEAN:
+                    result.setSysclean(sp.getParamvalue());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        Systemparam ss = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", "980"));
+        if (ss != null) {
+            result.setSysparmParaValue(ss.getParamvalue());
+        } else {
+            result.setSysparmParaValue("0");
+        }
+        Systemparam s = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", "974"));
+        if (s != null && StringUtils.isNotBlank(s.getParamvalue()) && "1.5".equals(s.getParamvalue())) {
+            result.setClearFlag(1);
+        } else {
+            result.setClearFlag(0);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult update(HttpServletRequest request, SystemSetUpDetail param) {
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        //更新待开市时间
+        updateSystem(SysConstants.SYSPARAM_SETTING_OPEN_MARKET, param.getOpenMarket(), user.getLogincode(), user.getAutoid());
+        //更新归属交易日
+        updateSystem(SysConstants.SYSPARAM_SETTING_SETTLE_TRADEDAY, param.getOpenMarketDayType(), user.getLogincode(), user.getAutoid());
+        //更新系统结算时间
+        updateSystem(SysConstants.SYSPARAM_SETTING_SETTLEMENT, param.getSettlement(), user.getLogincode(), user.getAutoid());
+        //更新银行签到时间
+        updateSystem(SysConstants.SYSPARAM_SETTING_SIGN_IN, param.getSignIn(), user.getLogincode(), user.getAutoid());
+        //银行签退时间
+        updateSystem(SysConstants.SYSPARAM_SETTING_SIGN_OUT, param.getSignOut(), user.getLogincode(), user.getAutoid());
+
+        if (StringUtils.isNotBlank(param.getSysclean())) {
+            //系统清算时间
+            updateSystem(SysConstants.SYSPARAM_SETTING_SYS_CLEAN, param.getSysclean(), user.getLogincode(), user.getAutoid());
+        }
+
+        Systemparam p = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_ID_CONFIG));
+        if (p != null) {
+            p.setParamvalue(String.valueOf(System.currentTimeMillis()));
+            p.setUpdatetime(new Date());
+            iSystemparamMapper.update(p, new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_ID_CONFIG));
+        }
+
+        //更新签退时间通知
+        NotifyMI1.UpdateCheckoutTimeNtf.Builder builder = NotifyMI1.UpdateCheckoutTimeNtf.newBuilder();
+        Common.MessageHead.Builder hd = Common.MessageHead.newBuilder();
+        PublicMI1.NotifyHead.Builder nhd = PublicMI1.NotifyHead.newBuilder();
+        nhd.setNtfMode(0);
+        hd.setFunCode(FunCodeConstants.FuncCode_UpdateCheckoutTimeNtf);
+        hd.setClientTime(System.currentTimeMillis());
+        builder.setNtfHeader(nhd);
+        builder.setNotifyTime(new SimpleDateFormat(DateTimeUtils.DATETIME_PATTERN).format(new Date()));
+        builder.setHeader(hd);
+
+        iSendMsgService.sendMsg(builder.build().toByteArray(), SysConstants.RabbitNtfKey,
+                FunCodeConstants.FuncCode_UpdateCheckoutTimeNtf);
+
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult clearMarketRunPlan(HttpServletRequest request) {
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        iMarketrunstepdetailMapper.delete(new QueryWrapper<>());
+        systemmanagerService.writeOperateLog(SysConstants.BUSINESS_SYSTEMSETTING, "清空运行时段", user, null, null, null);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult<EnumDicsResult> getEnumDics(HttpServletRequest request) {
+        EnumDicsResult enumDicsResult = new EnumDicsResult();
+        List<Enumgroup> enumGroups = new ArrayList<>();
+        List<Enumdic> enumDics = iEnumdicMapper.selectList(new QueryWrapper<Enumdic>()
+                .eq("showflag", 1));
+        for (Enumdic enumDic : enumDics) {
+            Enumgroup eg = iEnumgroupMapper.selectOne(new QueryWrapper<Enumgroup>()
+                    .eq("enumgroupid", enumDic.getEnumgroupid()));
+            if (!enumGroups.contains(eg)) {
+                enumGroups.add(eg);
+            }
+        }
+        enumDicsResult.setEnumdics(enumDics);
+        enumDicsResult.setEnumgroups(enumGroups);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), enumDicsResult);
+    }
+
+    @Override
+    public PageResult<EnumDicsPageResult> queryEnumDicItemByPage(EnumDicsPageParam param, HttpServletRequest request) {
+        IPage<EnumDicsPageResult> queryResultIPage;
+        IPage<EnumDicsPageResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        if(param.getEnumdiccode() == null || param.getIsmappingtobank() == null){
+            param.setModifyflag(1);
+            param.setShowflag(1);
+            queryResultIPage = iEnumdicMapper.queryEnumDicByPage(page,param);
+        }else{
+            param.setEnumitemstatus(1);
+            queryResultIPage = iEnumdicMapper.queryEnumDicItemByPage(page,param);
+        }
+        PageResult<EnumDicsPageResult> 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<Enumdic> editEnumDic(Long autoid, Long enumgroupid, HttpServletRequest request) {
+        if (autoid != null && autoid > 0) {
+            Enumdic enumDic = iEnumdicMapper.selectOne(new QueryWrapper<Enumdic>().eq("AUTOID",autoid));
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), enumDic);
+        } else {
+            Enumdic enumDic = new Enumdic();
+            enumDic.setEnumgroupid(enumgroupid);
+            enumDic.setIsmappingtobank(0);
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), enumDic);
+        }
+    }
+
+    @Override
+    public AjaxResult<EnumdicitemVoResult> editEnumDicItem(Long autoid, Long enumdiccode, Integer ismappingtobank, HttpServletRequest request) {
+        EnumdicitemVoResult result = new EnumdicitemVoResult();
+        if (autoid != null) {
+            Enumdicitem enumdicitem =  iEnumdicitemMapper.selectOne(new QueryWrapper<Enumdicitem>().eq("autoid",autoid));
+            result.setEnumdicitem(enumdicitem);
+        }
+        if (("certificatetype".equals(enumdiccode)) && autoid != null) {
+            Certificatetypeconfig certificateTypeConfig = iCertificatetypeconfigMapper.selectOne(new QueryWrapper<Certificatetypeconfig>()
+                    .eq("enumdicitemid",autoid));
+            result.setConfig(certificateTypeConfig);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
+    }
+
+    @Override
+    public AjaxResult saveEnumDic(Enumdic enumdic, HttpServletRequest request) {
+        Enumdic current = iEnumdicMapper.selectOne(new QueryWrapper<Enumdic>().eq("enumdiccode",enumdic.getEnumdiccode()));
+        if (current != null) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM026.getCode(), request.getHeader("Accept-Language"));
+        }
+        enumdic.setItemstatus(SysEnums.CommonStatus.WORK.getCode());
+        enumdic.setShowflag(1);
+        enumdic.setModifyflag(1);
+        if (enumdic.getAutoid() == null || enumdic.getAutoid() <= 0) {
+            iEnumdicMapper.insert(enumdic);
+        } else {
+            iEnumdicMapper.updateById(enumdic);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult updateOrSave(EnumDicItemSave param, HttpServletRequest request) {
+        if (param.getAutoid() != null) {
+            Enumdicitem enumDicItem = iEnumdicitemMapper.selectOne(new QueryWrapper<Enumdicitem>().eq("autoid",param.getAutoid()));
+            Enumdicitem enumDicItemExit = iEnumdicitemMapper.selectOne(new QueryWrapper<Enumdicitem>()
+                    .eq("enumdicname", param.getEnumdicname())
+                    .eq("enumdiccode",param.getEnumdiccode()));
+            if (enumDicItemExit != null && !param.getEnumdicname().equals(enumDicItem.getEnumdicname())) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM027.getCode(), request.getHeader("Accept-Language"));
+            }
+            Enumdicitem enumDicItemExit2 = iEnumdicitemMapper.selectOne(new QueryWrapper<Enumdicitem>()
+                    .eq("enumitemname", param.getEnumitemname())
+                    .eq("enumdiccode",param.getEnumdiccode()));
+            if (enumDicItemExit2 != null && !param.getEnumitemname().equals(enumDicItem.getEnumitemname())) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM028.getCode(), request.getHeader("Accept-Language"));
+            }
+            enumDicItem.setEnumdiccode(param.getEnumdiccode());
+            enumDicItem.setEnumdicname(param.getEnumdicname());
+            enumDicItem.setEnumitemname(param.getEnumitemname());
+            enumDicItem.setBankmappedvalue(param.getBankmappedvalue());
+            enumDicItem.setRemark(param.getRemark());
+            iEnumdicitemMapper.updateById(enumDicItem);
+            if (("certificatetype".equals(param.getEnumdiccode()))) {
+                Certificatetypeconfig certificateTypeConfig = iCertificatetypeconfigMapper.selectOne(new QueryWrapper<Certificatetypeconfig>()
+                        .eq("enumdicitemid",param.getAutoid()));
+                if (certificateTypeConfig == null) {
+                    certificateTypeConfig = new Certificatetypeconfig();
+                    certificateTypeConfig.setEnumdicitemid(param.getAutoid());
+                }
+                certificateTypeConfig.setCardlength(param.getCardlength());
+                certificateTypeConfig.setIsperson(param.getIsperson());
+                certificateTypeConfig.setRegexpress(param.getRegexpress());
+                iCertificatetypeconfigMapper.update(certificateTypeConfig,new QueryWrapper<Certificatetypeconfig>()
+                        .eq("enumdicitemid",param.getAutoid()));
+            }
+            redisServiceUtil.updateHash(Constants.REDIS_HEADER_DICT + enumDicItem.getEnumdiccode(),
+                    enumDicItem.getEnumitemname().toString(), enumDicItem.getEnumdicname());
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+        } else {
+            Enumdicitem enumDicItem = new Enumdicitem();
+            Enumdic enumDic = iEnumdicMapper.selectOne(new QueryWrapper<Enumdic>().eq("enumdiccode",param.getEnumdiccode()));
+            if (param.getEnumitemname() == null) {
+                List<Enumdicitem> enumDicItems = iEnumdicitemMapper.selectList(new QueryWrapper<Enumdicitem>().eq("enumdiccode",param.getEnumdiccode()));
+                enumDicItem.setEnumitemname(enumDicItems.size() + 1);
+            } else {
+                Enumdicitem enumDicItemExit = iEnumdicitemMapper.selectOne(new QueryWrapper<Enumdicitem>()
+                        .eq("enumdicname", param.getEnumdicname())
+                        .eq("enumdiccode",param.getEnumdiccode()));
+                if (enumDicItemExit != null) {
+                    return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM027.getCode(), request.getHeader("Accept-Language"));
+                }
+                Enumdicitem enumDicItemExit2 = iEnumdicitemMapper.selectOne(new QueryWrapper<Enumdicitem>()
+                        .eq("enumitemname", param.getEnumitemname())
+                        .eq("enumdiccode",param.getEnumdiccode()));
+                if (enumDicItemExit2 != null) {
+                    return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM028.getCode(), request.getHeader("Accept-Language"));
+                }
+                enumDicItem.setEnumitemname(param.getEnumitemname());
+            }
+
+            enumDicItem.setEnumdiccode(param.getEnumdiccode());
+            enumDicItem.setEnumdicid(enumDic.getAutoid());
+            enumDicItem.setEnumdicname(param.getEnumdicname());
+            enumDicItem.setBankmappedvalue(param.getBankmappedvalue());
+            enumDicItem.setRemark(param.getRemark());
+            enumDicItem.setEnumitemstatus(1);
+            iEnumdicitemMapper.insert(enumDicItem);
+            if (("certificatetype".equals(param.getEnumdiccode()))) {
+                Certificatetypeconfig certificateTypeConfig = new Certificatetypeconfig();
+                certificateTypeConfig.setEnumdicitemid(enumDicItem.getAutoid());
+                certificateTypeConfig.setCardlength(param.getCardlength());
+                certificateTypeConfig.setIsperson(param.getIsperson());
+                certificateTypeConfig.setRegexpress(param.getRegexpress());
+                iCertificatetypeconfigMapper.insert(certificateTypeConfig);
+            }
+            redisServiceUtil.updateHash(Constants.REDIS_HEADER_DICT + enumDicItem.getEnumdiccode(),
+                    enumDicItem.getEnumitemname().toString(), enumDicItem.getEnumdicname());
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+        }
+    }
+
+    @Override
+    public AjaxResult delEnumdicItem(Long autoid, Integer flag, HttpServletRequest request) {
+        if (flag == 1) {
+            Enumdicitem enumDicItem = iEnumdicitemMapper.selectOne(new QueryWrapper<Enumdicitem>().eq("AUTOID",autoid));
+            String enumdiccode = enumDicItem.getEnumdiccode();
+            if (("certificatetype".equals(enumdiccode))) {
+                iCertificatetypeconfigMapper.delete(new QueryWrapper<Certificatetypeconfig>()
+                        .eq("enumdicitemid",autoid));
+            }
+            redisServiceUtil.delHash(Constants.REDIS_HEADER_DICT + enumDicItem.getEnumdiccode(), enumDicItem.getEnumitemname().toString());
+            iEnumdicitemMapper.deleteById(enumDicItem);
+        }
+        if (flag == 0) {
+            Enumdic enumDic = iEnumdicMapper.selectOne(new QueryWrapper<Enumdic>().eq("AUTOID",autoid));
+            String enumdiccode = enumDic.getEnumdiccode();
+            if (("certificatetype".equals(enumdiccode))) {
+                iCertificatetypeconfigMapper.delete(new QueryWrapper<Certificatetypeconfig>()
+                        .eq("enumdicitemid",autoid));
+            }
+            redisServiceUtil.delHash(Constants.REDIS_HEADER_DICT + enumDic.getEnumdiccode(), enumDic.getEnumdicname());
+            iEnumdicMapper.deleteById(enumDic);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+
+    private void updateSystem(String code, String openMarket, String logincode, Long value) {
+        try {
+            Systemparam systemparam = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", code));
+            systemparam.setParamvalue(code.equals(SysConstants.SYSPARAM_SETTING_SETTLE_TRADEDAY) ? openMarket : formatHHMM(openMarket));
+            systemparam.setLoginid(logincode);
+            systemparam.setUserid(value);
+            systemparam.setUpdatetime(new Date());
+            iSystemparamMapper.update(systemparam, new QueryWrapper<Systemparam>().eq("PARAMCODE", code));
+        } catch (Exception e) {
+            log.error("时间格式错误！");
+        }
+    }
+
+    private String formatHHMM(String time) throws ParseException {
+        time = DateTimeUtils.format(DateTimeUtils.parseDate(time, "HH:mm"), "HH:mm");
+        return time;
+    }
+
     private void update(DivisionAddParam param, Systemmanager user, Division div) {
         String oldDivisionCode = div.getDivisioncode();
         div.setDivisioncode(param.getDivisioncode());

mtp3-century/src/main/java/com/muchinfo/mtp3century/utils/RedisServiceUtil.java

@@ -281,4 +281,8 @@ public class RedisServiceUtil {
     public void updateHash(String key, String field, Object value){
         redisTemplate.opsForHash().put(key, field, value);
     }
+
+    public void delHash(String key, String field){
+        redisTemplate.opsForHash().delete(key, field);
+    }
 }

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

@@ -0,0 +1,57 @@
+<?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.IEnumdicMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.muchinfo.mtp3pojos.entity.Enumdic">
+        <id column="AUTOID" property="autoid" />
+        <result column="ENUMGROUPID" property="enumgroupid" />
+        <result column="ENUMDICCODE" property="enumdiccode" />
+        <result column="ENUMDICNAME" property="enumdicname" />
+        <result column="ITEMSTATUS" property="itemstatus" />
+        <result column="ISMAPPINGTOBANK" property="ismappingtobank" />
+        <result column="REMARK" property="remark" />
+        <result column="SHOWFLAG" property="showflag" />
+        <result column="MODIFYFLAG" property="modifyflag" />
+        <result column="ITEMMAINTAINTYPE" property="itemmaintaintype" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        AUTOID, ENUMGROUPID, ENUMDICCODE, ENUMDICNAME, ITEMSTATUS, ISMAPPINGTOBANK, REMARK, SHOWFLAG, MODIFYFLAG, ITEMMAINTAINTYPE
+    </sql>
+    <select id="queryEnumDicByPage" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.EnumDicsPageResult">
+        select * from EnumDic
+        <where>
+            <if test="vo.enumgroupid != null">
+                and enumgroupid = #{vo.enumgroupid}
+            </if>
+            <if test="vo.enumdiccode != null">
+                and enumdiccode = #{vo.enumdiccode}
+            </if>
+            <if test="vo.showflag != null">
+                and showflag = #{vo.showflag}
+            </if>
+            <if test="vo.modifyflag != null">
+                and modifyflag = #{vo.modifyflag}
+            </if>
+        </where>
+        order by autoid
+    </select>
+    <select id="queryEnumDicItemByPage" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.EnumDicsPageResult">
+        select * from EnumDicItem edi LEFT JOIN EnumDic ed ON ed.AUTOID = edi.ENUMDICID
+        <where>
+            <if test="vo.enumdicid != null">
+                and edi.enumdicid = #{vo.enumdicid}
+            </if>
+            <if test="vo.enumdiccode != null">
+                and edi.enumdiccode = #{vo.enumdiccode}
+            </if>
+            <if test="vo.enumitemstatus != null">
+                and edi.enumitemstatus = #{vo.enumitemstatus}
+            </if>
+        </where>
+        order by edi.autoid
+    </select>
+
+</mapper>

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

@@ -68,6 +68,7 @@
         GOODSID, GOODSCODE, GOODSNAME, MARKETID, GOODSGROUPID, GOODSSTATUS, CURRENCYID, GOODUNITID, AGREEUNIT, DECIMALPLACE, LISTINGDATE, LASTTRADEDATE, DELISTINGDATE, DELIVERYFLAG, HASQUOTER, HQPROTECTTIME, QUOTESHOWTYPE, QUOTESHOWTYPEINTERVAL, MODIFYSTATUS, GOODSTRADETYPE, CREATORID, CREATETIME, AUDITACCOUNTID, AUDITTIME, MODIFYTIME, MODIFIERID, CANCELACCOUNTID, REMARK, CANCELTIME, DELISTINGMODE, FORCECLOSEMODE, FORCECLOSEVALUE, CUTMODE, QUOTEMINUNIT, ISBUYLIMITED, INNERDEALMODE, OUTERDEALMODE, CLOSEPRICEMODE, CLOSEPRICEPARAM, QTYDECIMALPLACE, GOODSCURRENCYID, GOODSQUOTETYPE, QUOTEGEAR, OUTGOODSCODE, ISVISIBLE, AREAUSERID, PICTUREURL, REFGOODSID, SWAPDAYS, REFGOODSCODE, PROVIDERUSERID, PROVIDERACCOUNTID, TRANSFERDEPOSITRATIO, PRESALEPRICE, PRESALEFLAG, NEWTRANSFERDEPOSITRATIO, MARGINALGORITHM
     </sql>
     <select id="queryGoodsSelect" resultType="com.muchinfo.mtp3pojos.vo.common.GoodsSelectResult">
+        select * from (
         select g.goodsid as goodsId, g.goodscode as goodsCode, g.goodsname as goodsName , g.goodunitid
         ,gex.goodsnameth ,gex.goodsnameen ,gex.goodsnametw ,gex.goodsnamevi
         from goods g
@@ -82,12 +83,13 @@
                 </foreach>
             </if>
             <if test="vo.areauserid != null and vo.areauserid != 0 and vo.areauserid != 1">
-                and g.marketid in (select marketid from AREAROLEMARKET where areauserid = #{vo.areauserid,jdbcType=DECIMAL}
-                )
+                and g.marketid in (select marketid from AREAROLEMARKET where areauserid = #{vo.areauserid,jdbcType=DECIMAL})
             </if>
             <if test="vo.searchCode != null and vo.searchCode != '' ">
-                and g.goodscode like
-                '%'||#{vo.searchCode}||'%'
+                and (g.goodsname like
+                '%'||#{vo.searchCode,jdbcType=VARCHAR}||'%'
+                or g.goodscode like
+                '%'||#{vo.searchCode,jdbcType=VARCHAR}||'%')
             </if>
             <if test="vo.marketId != null and vo.marketId != '' ">
                 and g.marketid = #{vo.marketId}
@@ -99,14 +101,13 @@
                 and g.goodsid in(select t.goodsid from AreaGoodsConfig t where t.userid= #{vo.yyareauserid})
             </if>
             <if test="tradeModeSplit!=null and tradeModeSplit.length>0">
-                <foreach collection="tradeModeSplit" item="item" open=" and m.trademode in (" close=")"
+                <foreach collection="tradeModeSplit" item="item" open=" and m.trademode not in (" close=")"
                          separator=",">
                     ${item}
                 </foreach>
             </if>
         </where>
-        and rownum &lt;= 10
-        order by g.goodscode
+        order by g.goodscode) t where rownum &lt;= 10
     </select>
 
     <select id="getNoTradeConfigGoods" parameterType="map" resultMap="BaseResultMap">

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

@@ -281,6 +281,7 @@
             START WITH ua.userid = #{areaUserId}
             CONNECT BY PRIOR ua.userid = ua.parentuserid
         </if>
+        and rownum &lt;= 10
         order by ua.userid
     </select>
 
@@ -364,6 +365,9 @@
             <if test="vo.parentuserid != null">
                 and o.parentuserid = #{vo.parentuserid}
             </if>
+            <if test="vo.markets != null and vo.markets !='' ">
+                and o.userid in (select t.areauserid from arearolemarket t where t.marketid in (${vo.markets}))
+            </if>
         </where>
         order by o.accountstatus,o.userid
     </select>

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

@@ -126,7 +126,10 @@
             resultMap="UserinfoDetailVo">
         select t.* from draft_userinfo t where t.userid = #{userid}
     </select>
-
+    <select id="queryUserinfoTa" resultType="com.muchinfo.mtp3pojos.entity.Userinfo">
+        select ta.accountid, ui.* from taaccount ta
+        left join userinfo ui on ui.userid = ta.userid
+    </select>
 
 
 </mapper>

mtp3-century/src/main/resources/message_en.properties

@@ -53,6 +53,9 @@ message_error_code_system022=The exchange rate does not exist
 message_error_code_system023=Duplicate region code
 message_error_code_system024=Duplicate region names
 message_error_code_system025=Delete failed, please delete its sub regions first
+message_error_code_system026=The enumeration code already exists
+message_error_code_system027=The name already exists
+message_error_code_system028=The enumeration item value already exists
 login_error_code_001=Account or password error
 login_error_code_002=Unauthorized access is not allowed! Please contact the administrator to handle it!
 login_error_code_003=Login locked!

mtp3-century/src/main/resources/message_th.properties

@@ -53,6 +53,9 @@ message_error_code_system022=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2D\u0E31\u0E15\u0
 message_error_code_system023=\u0E23\u0E2B\u0E31\u0E2A\u0E40\u0E02\u0E15 \u0E0B\u0E49\u0E33\u0E01\u0E31\u0E19
 message_error_code_system024=\u0E0A\u0E37\u0E48\u0E2D\u0E20\u0E32\u0E04 \u0E0B\u0E49\u0E33\u0E01\u0E31\u0E19
 message_error_code_system025=\u0E01\u0E32\u0E23\u0E25\u0E1A\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27\u0E42\u0E1B\u0E23\u0E14\u0E25\u0E1A\u0E1E\u0E37\u0E49\u0E19\u0E17\u0E35\u0E48\u0E22\u0E48\u0E2D\u0E22\u0E01\u0E48\u0E2D\u0E19
+message_error_code_system026=\u0E23\u0E2B\u0E31\u0E2A\u0E01\u0E32\u0E23\u0E41\u0E08\u0E01\u0E41\u0E08\u0E07\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+message_error_code_system027=\u0E0A\u0E37\u0E48\u0E2D\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+message_error_code_system028=\u0E04\u0E48\u0E32\u0E02\u0E2D\u0E07\u0E23\u0E32\u0E22\u0E01\u0E32\u0E23 enumeration \u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
 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!

mtp3-century/src/main/resources/message_vi.properties

@@ -53,6 +53,9 @@ message_error_code_system022=T\u1EF7 gi\u00E1 h\u1ED1i \u0111o\u00E1i kh\u00F4ng
 message_error_code_system023=M\u00E3 v\u00F9ng l\u1EB7p l\u1EA1i
 message_error_code_system024=T\u00EAn mi\u1EC1n tr\u00F9ng l\u1EB7p
 message_error_code_system025=X\u00F3a kh\u00F4ng th\u00E0nh c\u00F4ng, tr\u01B0\u1EDBc ti\u00EAn h\u00E3y x\u00F3a khu v\u1EF1c con c\u1EE7a n\u00F3
+message_error_code_system026=M\u00E3 li\u1EC7t k\u00EA \u0111\u00E3 t\u1ED3n t\u1EA1i
+message_error_code_system027=T\u00EAn \u0111\u00E3 t\u1ED3n t\u1EA1i
+message_error_code_system028=Gi\u00E1 tr\u1ECB Enumeration \u0111\u00E3 t\u1ED3n t\u1EA1i
 login_error_code_001=L\u1ED7i t\u00E0i kho\u1EA3n ho\u1EB7c m\u1EADt kh\u1EA9u
 login_error_code_002=Kh\u00F4ng \u0111\u01B0\u1EE3c ph\u00E9p, kh\u00F4ng th\u1EC3 truy c\u1EADp! Vui l\u00F2ng li\u00EAn h\u1EC7 v\u1EDBi qu\u1EA3n tr\u1ECB vi\u00EAn \u0111\u1EC3 x\u1EED l\u00FD!
 login_error_code_003=Kh\u00F3a \u0111\u0103ng nh\u1EADp!

mtp3-century/src/main/resources/message_zh-cn.properties

@@ -53,6 +53,9 @@ message_error_code_system022=\u8BE5\u6C47\u7387\u4E0D\u5B58\u5728
 message_error_code_system023=\u5730\u533A\u4EE3\u7801\u91CD\u590D
 message_error_code_system024=\u5730\u533A\u540D\u79F0\u91CD\u590D
 message_error_code_system025=\u5220\u9664\u5931\u8D25,\u8BF7\u5148\u5C06\u5176\u5B50\u5730\u533A\u5220\u9664
+message_error_code_system026=\u679A\u4E3E\u4EE3\u7801\u5DF2\u7ECF\u5B58\u5728
+message_error_code_system027=\u540D\u79F0\u5DF2\u7ECF\u5B58\u5728
+message_error_code_system028=\u679A\u4E3E\u9879\u503C\u5DF2\u7ECF\u5B58\u5728
 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

mtp3-century/src/main/resources/message_zh-hk.properties

@@ -53,6 +53,9 @@ message_error_code_system022=\u8A72\u532F\u7387\u4E0D\u5B58\u5728
 message_error_code_system023=\u5730\u5340\u7A0B\u5F0F\u78BC\u91CD\u8907
 message_error_code_system024=\u5730\u533A\u540D\u79F0\u91CD\u590D
 message_error_code_system025=\u5220\u9664\u5931\u8D25,\u8BF7\u5148\u5C06\u5176\u5B50\u5730\u533A\u5220\u9664
+message_error_code_system026=\u679A\u8209\u7A0B\u5F0F\u78BC\u5DF2\u7D93\u5B58\u5728
+message_error_code_system027=\u540D\u7A31\u5DF2\u7D93\u5B58\u5728
+message_error_code_system028=\u679A\u8209\u9805\u503C\u5DF2\u7D93\u5B58\u5728
 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

mtp3-century/src/main/resources/message_zh-tw.properties

@@ -53,6 +53,9 @@ message_error_code_system022=\u8A72\u532F\u7387\u4E0D\u5B58\u5728
 message_error_code_system023=\u5730\u5340\u7A0B\u5F0F\u78BC\u91CD\u8907
 message_error_code_system024=\u5730\u5340\u540D\u7A31\u91CD\u8907
 message_error_code_system025=\u5220\u9664\u5931\u6557\uFF0C\u8ACB\u5148\u5C07\u5176\u5B50\u5730\u5340\u5220\u9664
+message_error_code_system026=\u679A\u8209\u7A0B\u5F0F\u78BC\u5DF2\u7D93\u5B58\u5728
+message_error_code_system027=\u540D\u7A31\u5DF2\u7D93\u5B58\u5728
+message_error_code_system028=\u679A\u8209\u9805\u503C\u5DF2\u7D93\u5B58\u5728
 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

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

@@ -61,6 +61,9 @@ public enum MessageType {
     MESSAGE_ERROR_CODE_SYSTEM023("message_error_code_system023", "地区代码重复"),
     MESSAGE_ERROR_CODE_SYSTEM024("message_error_code_system024", "地区名称重复"),
     MESSAGE_ERROR_CODE_SYSTEM025("message_error_code_system025", "删除失败,请先将其子地区删除"),
+    MESSAGE_ERROR_CODE_SYSTEM026("message_error_code_system026", "枚举代码已经存在"),
+    MESSAGE_ERROR_CODE_SYSTEM027("message_error_code_system027", "名称已经存在"),
+    MESSAGE_ERROR_CODE_SYSTEM028("message_error_code_system028", "枚举项值已经存在"),
 
     LOGIN_ERROR_CODE_001("login_error_code_001", "账户或密码错误"),
     LOGIN_ERROR_CODE_002("login_error_code_002", "未经允许，不可访问！请联系管理员处理"),

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

@@ -0,0 +1,24 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.muchinfo.mtp3pojos.entity.Enumdic;
+import com.muchinfo.mtp3pojos.vo.systemsetup.EnumDicsPageParam;
+import com.muchinfo.mtp3pojos.vo.systemsetup.EnumDicsPageResult;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 枚举字典表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-05-20
+ */
+public interface IEnumdicMapper extends BaseMapper<Enumdic> {
+
+    IPage<EnumDicsPageResult> queryEnumDicByPage(IPage<EnumDicsPageResult> page, @Param("vo") EnumDicsPageParam param);
+
+    IPage<EnumDicsPageResult> queryEnumDicItemByPage(IPage<EnumDicsPageResult> page,@Param("vo") EnumDicsPageParam param);
+
+}

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

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Enumgroup;
+
+/**
+ * <p>
+ * 枚举分组表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-05-20
+ */
+public interface IEnumgroupMapper extends BaseMapper<Enumgroup> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Marketrunstepdetail;
+
+/**
+ * <p>
+ * 市场运行时间段明细 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-05-16
+ */
+public interface IMarketrunstepdetailMapper extends BaseMapper<Marketrunstepdetail> {
+
+}

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

@@ -6,6 +6,8 @@ import com.muchinfo.mtp3pojos.vo.investor.UserinfoDetailVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户信息表 Mapper 接口
@@ -20,4 +22,6 @@ public interface IUserinfoMapper extends BaseMapper<Userinfo> {
     UserinfoDetailVo getUserinfoDetail(@Param("userid") Long userid);
 
     UserinfoDetailVo getUserinfoNewDetail(@Param("userid") Long userid);
+
+    List<Userinfo> queryUserinfoTa();
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Enumdic.java

@@ -0,0 +1,77 @@
+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;
+
+/**
+ * <p>
+ * 枚举字典表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ENUMDIC")
+@ApiModel(value="Enumdic对象", description="枚举字典表")
+@KeySequence(value = "SEQ_ENUMDIC")
+public class Enumdic extends Model<Enumdic> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "自增ID")
+    @TableId(value = "AUTOID", type = IdType.INPUT)
+    private Long autoid;
+
+    @ApiModelProperty(value = "所属枚举分组ID")
+    @TableField("ENUMGROUPID")
+    private Long enumgroupid;
+
+    @ApiModelProperty(value = "枚举代码")
+    @TableField("ENUMDICCODE")
+    private String enumdiccode;
+
+    @ApiModelProperty(value = "枚举名称")
+    @TableField("ENUMDICNAME")
+    private String enumdicname;
+
+    @ApiModelProperty(value = "枚举项状态 - 1.启用 2.不启用")
+    @TableField("ITEMSTATUS")
+    private Integer itemstatus;
+
+    @ApiModelProperty(value = "是否映射到银行服务 - 0:不映射 1:映射")
+    @TableField("ISMAPPINGTOBANK")
+    private Integer ismappingtobank;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty(value = "是否显示 - 0:不显示  1:显示")
+    @TableField("SHOWFLAG")
+    private Integer showflag;
+
+    @ApiModelProperty(value = "修改标志 - 0:不允许修改   1:允许修改")
+    @TableField("MODIFYFLAG")
+    private Integer modifyflag;
+
+    @ApiModelProperty(value = "子项维护类型 - 1:不可维护 2:系统项内维护 3:客户自主维护 4:初始化维护(如交易模式,交易属性)")
+    @TableField("ITEMMAINTAINTYPE")
+    private Integer itemmaintaintype;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.autoid;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Enumdicitem.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;
@@ -28,13 +25,14 @@ import java.math.BigDecimal;
 @ApiModel(value="Enumdicitem对象", description="枚举项字典表")
 @AllArgsConstructor
 @NoArgsConstructor
+@KeySequence(value = "SEQ_ENUMDICITEM")
 @Builder
 public class Enumdicitem extends Model<Enumdicitem> {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "自增ID")
-    @TableId(value = "AUTOID")
+    @TableId(value = "AUTOID", type = IdType.INPUT)
     private Long autoid;
 
     @ApiModelProperty(value = "所属枚举ID")

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Enumgroup.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-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ENUMGROUP")
+@ApiModel(value="Enumgroup对象", description="枚举分组表")
+public class Enumgroup extends Model<Enumgroup> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "枚举分组ID")
+    private Long enumgroupid;
+
+    @ApiModelProperty(value = "枚举分组名称")
+    @TableField("ENUMGROUPNAME")
+    private String enumgroupname;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("REMARK")
+    private String remark;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.enumgroupid;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Marketrunstepdetail.java

@@ -0,0 +1,82 @@
+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;
+
+/**
+ * <p>
+ * 市场运行时间段明细
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-05-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("MARKETRUNSTEPDETAIL")
+@ApiModel(value="Marketrunstepdetail对象", description="市场运行时间段明细")
+@KeySequence(value = "SEQ_MARKETRUNSTEPDETAIL")
+public class Marketrunstepdetail extends Model<Marketrunstepdetail> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "自增ID")
+    @TableId(value = "AUTOID", type = IdType.INPUT)
+    private Long autoid;
+
+    @ApiModelProperty(value = "市场ID --  其它特殊如下 0-系统 1-交割服务 2-账户服务3-履约服务 4-仓单服务 5-积分服务 6-银行服务")
+    @TableField("MARKETID")
+    private Long marketid;
+
+    @ApiModelProperty(value = "交易日归属 - 0:星期天、1:星期一、2:星期二、3:星期三、4:星期四、5:星期五、6:星期六")
+    @TableField("TRADEWEEKDAY")
+    private Integer tradeweekday;
+
+    @ApiModelProperty(value = "从 1 开始 往下编")
+    @TableField("SECTIONID")
+    private Integer sectionid;
+
+    @ApiModelProperty(value = "运行阶段 - 1:集合竞价、  2:连续竞价(交割)  3:-- 4:确认行权、交收时段、(补充交收")
+    @TableField("RUNSTEP")
+    private Integer runstep;
+
+    @ApiModelProperty(value = "开市时间")
+    @TableField("STARTWEEKDAY")
+    private Integer startweekday;
+
+    @ApiModelProperty(value = "起始时间(HH:mm)")
+    @TableField("STARTTIME")
+    private String starttime;
+
+    @ApiModelProperty(value = "休市时间")
+    @TableField("ENDWEEKDAY")
+    private Integer endweekday;
+
+    @ApiModelProperty(value = "结束时间(HH:mm)")
+    @TableField("ENDTIME")
+    private String endtime;
+
+    @ApiModelProperty(value = "开始日标识 - (...-3上三日 -2:上两日 -1:上日 0:当日 1:次日...)")
+    @TableField("STARTFLAG")
+    private Integer startflag;
+
+    @ApiModelProperty(value = "结束日标识 - (...-3上三日 -2:上两日 -1:上日 0:当日 1:次日...)")
+    @TableField("ENDFLAG")
+    private Integer endflag;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.autoid;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Userinfo.java

@@ -288,7 +288,8 @@ public class Userinfo extends Model<Userinfo> {
 
     @TableField(select = false)
     private BigDecimal creditquota;
-
+    @TableField(select = false)
+    private Long accountid;
     @Override
     public Serializable pkVal() {
         return this.userid;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/UserAccountRoleParam.java

@@ -18,6 +18,8 @@ public class UserAccountRoleParam {
 
     private Integer pageNum;
 
+    private String markets;
+
     private Integer pageSize;
 
     private Long parentuserid;

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

@@ -0,0 +1,33 @@
+package com.muchinfo.mtp3pojos.vo.systemsetup;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "EnumDicItemSave对象", description = "数据字典管理列表")
+public class EnumDicItemSave {
+
+    private Long autoid;
+
+    private String enumdiccode;
+
+    private String enumdicname;
+
+    private Integer enumitemname;
+
+    private String bankmappedvalue;
+
+    private String remark;
+
+    private Integer cardlength;
+
+    private Integer isperson;
+
+    private String regexpress;
+}

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

@@ -0,0 +1,34 @@
+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 = "EnumDicsPageParam对象", description = "数据字典管理列表")
+public class EnumDicsPageParam {
+
+    private Integer enumgroupid;
+
+    private String enumdiccode;
+
+    private Integer ismappingtobank;
+
+    private Integer showflag;
+
+    private Integer modifyflag;
+
+    private Integer enumitemstatus;
+
+    @ApiModelProperty(value = "* 页码 *")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "* 页大小 *")
+    private Integer pageSize;
+}

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

@@ -0,0 +1,35 @@
+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 = "EnumDicsPageResult对象", description = "数据字典管理列表")
+public class EnumDicsPageResult {
+
+    @ApiModelProperty(value = "枚举代码")
+    private String enumdiccode;
+
+    @ApiModelProperty(value = "枚举名称")
+    private String enumdicname;
+
+    @ApiModelProperty(value = "枚举项值")
+    private String enumitemname;
+
+    @ApiModelProperty(value = "枚举项状态")
+    private String enumitemstatus;
+
+    private Integer ismappingtobank;
+
+    @ApiModelProperty(value = "枚举状态")
+    private String itemstatus;
+
+    private Long autoid;
+}

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

@@ -0,0 +1,23 @@
+package com.muchinfo.mtp3pojos.vo.systemsetup;
+
+import com.muchinfo.mtp3pojos.entity.Enumdic;
+import com.muchinfo.mtp3pojos.entity.Enumgroup;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "EnumDicsResult对象", description = "数据字典管理树")
+public class EnumDicsResult {
+
+    private List<Enumgroup> enumgroups;
+
+    private List<Enumdic> enumdics;
+}

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

@@ -0,0 +1,21 @@
+package com.muchinfo.mtp3pojos.vo.systemsetup;
+
+import com.muchinfo.mtp3pojos.entity.Certificatetypeconfig;
+import com.muchinfo.mtp3pojos.entity.Enumdicitem;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "EnumdicitemVoResule对象", description = "数据字典管理列表")
+public class EnumdicitemVoResult {
+
+    private Enumdicitem enumdicitem;
+
+    private Certificatetypeconfig config;
+}

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

@@ -0,0 +1,32 @@
+package com.muchinfo.mtp3pojos.vo.systemsetup;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "SystemSetUpDetail对象", description = "图片管理")
+public class SystemSetUpDetail {
+
+    private String openMarket;
+
+    private String settlement;
+
+    private String signIn;
+
+    private String signOut;
+
+    private String openMarketDayType;
+
+    private String sysclean;
+
+    private String sysparmParaValue;
+
+    private Integer clearFlag;
+
+}