新增接口

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

@@ -48,6 +48,26 @@ public class NoticeController {
         }
     }
 
+    @ApiOperation("通知公告-->发布通知公告-->修改")
+    @RequestMapping(method = RequestMethod.POST, value = "/noticemsgedit")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult noticemsgedit(@RequestBody String param, HttpServletRequest request) {
+        try {
+            NoticeMsgAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), NoticeMsgAddParam.class);
+            return iNoticeService.noticemsgedit(addParam, request);
+        } catch (Exception e) {
+            log.error("发布通知公告修改，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
+    }
+
+    @ApiOperation("通知公告-->公告通知管理-->提前失效")
+    @RequestMapping(method = RequestMethod.GET, value = "/invalid")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult invalid(Long auditid, HttpServletRequest request) {
+        return iNoticeService.invalid(auditid, request);
+    }
+
     @ApiOperation("通知公告-->公告通知管理-->获取列表")
     @RequestMapping(method = RequestMethod.GET, value = "/query")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
@@ -107,8 +127,14 @@ public class NoticeController {
     @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);
+    private AjaxResult dealcolumn(@RequestBody String param, HttpServletRequest request) {
+        try {
+            ColumnAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ColumnAddParam.class);
+            return iNoticeService.dealcolumn(addParam, request);
+        } catch (Exception e) {
+            log.error("资讯栏目新增/修改，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("通知公告-->资讯栏目-->详情")
@@ -127,7 +153,6 @@ public class NoticeController {
 
     @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);
@@ -136,8 +161,14 @@ public class NoticeController {
     @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);
+    private AjaxResult dealcolumnsource(@RequestBody String param, HttpServletRequest request) {
+        try {
+            ColumnSourceAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ColumnSourceAddParam.class);
+            return iNoticeService.dealcolumnsource(addParam, request);
+        } catch (Exception e) {
+            log.error("资讯来源新增/修改，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("通知公告-->资讯来源-->删除")
@@ -147,7 +178,7 @@ public class NoticeController {
         return iNoticeService.columnsourcedelete(memberid, request);
     }
 
-    @ApiOperation("通知公告-->资讯栏目-->详情")
+    @ApiOperation("通知公告-->资讯来源-->详情")
     @RequestMapping(method = RequestMethod.GET, value = "/columnsourceDetail")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     private AjaxResult<GzMemberinfo> columnsourceDetail(Long memberid, HttpServletRequest request) {

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

@@ -1,12 +1,16 @@
 package com.muchinfo.mtp3century.controller;
 
 import com.muchinfo.mtp3century.service.ISystemSetUpService;
+import com.muchinfo.mtp3century.utils.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Errorcode;
 import com.muchinfo.mtp3pojos.entity.Systemparam;
+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;
@@ -30,5 +34,44 @@ public class SystemSetUpController {
         return iSystemSetUpService.queryByPage(pageNum, pageSize, request);
     }
 
+    @ApiOperation("基础数据管理-->系统参数管理-->修改")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/dealParam")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult query(@RequestBody SystemParamUpdate paramUpdate, HttpServletRequest request) {
+        return iSystemSetUpService.dealParam(paramUpdate, request);
+    }
+
+    @ApiOperation("基础数据管理-->错误码管理-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryErr")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<Errorcode> queryErr(SystemErrorCodeParam param, HttpServletRequest request) {
+        return iSystemSetUpService.queryErr(param, request);
+    }
+
+    @ApiOperation("基础数据管理-->错误码管理-->修改")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/dealErr")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult dealErr(@RequestBody SystemErrorCodeParam param, HttpServletRequest request) {
+        return iSystemSetUpService.dealErr(param, request);
+    }
+
+    @ApiOperation("基础数据管理-->市场板块设置-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryMarketSet")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<SystemMarketSectionResult> queryMarketSet(SystemMarketSectionParam param, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iSystemSetUpService.queryMarketSet(param, pageNum, pageSize, request);
+    }
+
+    @ApiOperation("基础数据管理-->市场板块设置-->详情")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/marketSetDetail")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<SystemMarketSetDetail> marketSetDetail(SystemErrorCodeParam param, HttpServletRequest request) {
+        return iSystemSetUpService.marketSetDetail(param, request);
+    }
 
 }

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

@@ -57,4 +57,8 @@ public interface INoticeService {
     AjaxResult auditinform(Long id, Integer flag, HttpServletRequest request);
 
     AjaxResult deleteinform(Long id, HttpServletRequest request);
+
+    AjaxResult noticemsgedit(NoticeMsgAddParam addParam, HttpServletRequest request) throws ParseException;
+
+    AjaxResult invalid(Long auditid, HttpServletRequest request);
 }

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

@@ -1,10 +1,23 @@
 package com.muchinfo.mtp3century.service;
 
+import com.muchinfo.mtp3century.utils.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Errorcode;
 import com.muchinfo.mtp3pojos.entity.Systemparam;
+import com.muchinfo.mtp3pojos.vo.systemsetup.*;
 
 import javax.servlet.http.HttpServletRequest;
 
 public interface ISystemSetUpService {
     PageResult<Systemparam> queryByPage(Integer pageNum, Integer pageSize, HttpServletRequest request);
+
+    AjaxResult dealParam(SystemParamUpdate paramUpdate, HttpServletRequest request);
+
+    PageResult<Errorcode> queryErr(SystemErrorCodeParam param, HttpServletRequest request);
+
+    AjaxResult dealErr(SystemErrorCodeParam param, HttpServletRequest request);
+
+    PageResult<SystemMarketSectionResult> queryMarketSet(SystemMarketSectionParam param, Integer pageNum, Integer pageSize, HttpServletRequest request);
+
+    AjaxResult<SystemMarketSetDetail> marketSetDetail(SystemErrorCodeParam param, HttpServletRequest request);
 }

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

@@ -123,7 +123,7 @@ public class NoticeServiceImpl implements INoticeService {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         //平台登陆  查所有
         if (systemmanager.getAreauserid() != 0) {
-            if (StringUtils.isNotEmpty(param.getPublisher())) {
+            if (StringUtils.isBlank(param.getPublisher())) {
                 param.setPublisher(systemmanager.getAreauserid().toString());
             }
         }
@@ -471,25 +471,25 @@ public class NoticeServiceImpl implements INoticeService {
     @Override
     public AjaxResult dealinform(SiteColumndetail param, HttpServletRequest request) {
         Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        if(param.getId() == null){
+        if (param.getId() == null) {
             SiteColumndetail config = new SiteColumndetail();
             try {
-                if(StringUtils.isNotBlank(param.getPublishdate2())){
+                if (StringUtils.isNotBlank(param.getPublishdate2())) {
                     config.setPublishdate(DateTimeUtils.parseDate(config.getPublishdate2(),
                             DateTimeUtils.DATE_PATTERN));
-                }else{
+                } else {
                     config.setPublishdate(new Date());
                 }
             } catch (ParseException e) {
-               log.error("SiteColumndetail 日期转换异常，请检查");
+                log.error("SiteColumndetail 日期转换异常，请检查");
             }
             config.setContext(convertToHtml(config.getContext()));
 
-            if(config.getHits() == null){
+            if (config.getHits() == null) {
                 config.setHits(0L);
             }
 
-            if(config.getUserid()==null){
+            if (config.getUserid() == null) {
                 config.setUserid(user.getAreauserid());
             }
             config.setCreaedate(new Date());
@@ -497,8 +497,8 @@ public class NoticeServiceImpl implements INoticeService {
             config.setUpdatedate(new Date());
             config.setModifierid(user.getAutoid());
             iSiteColumndetailMapper.insert(config);
-        }else{
-            SiteColumndetail temp = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id",param.getId()));
+        } else {
+            SiteColumndetail temp = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id", param.getId()));
 
             log.debug("updateSiteColumnDetail:");
             temp.setContext(convertToHtml(param.getContext()));
@@ -514,7 +514,7 @@ public class NoticeServiceImpl implements INoticeService {
             temp.setHits((param.getHits()) == null ? 0L : param.getHits());
             temp.setSrcid(param.getSrcid());
             try {
-                if(StringUtils.isNotBlank(param.getPublishdate2())){
+                if (StringUtils.isNotBlank(param.getPublishdate2())) {
                     temp.setPublishdate(DateTimeUtils.parseDate(param.getPublishdate2(),
                             DateTimeUtils.DATE_PATTERN));
                 }
@@ -528,10 +528,10 @@ public class NoticeServiceImpl implements INoticeService {
 
     @Override
     public AjaxResult auditinform(Long id, Integer flag, HttpServletRequest request) {
-        SiteColumndetail temp = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id",id));
-        if(flag==1){
+        SiteColumndetail temp = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id", id));
+        if (flag == 1) {
             temp.setStatus(20);
-        }else{
+        } else {
             temp.setStatus(30);
         }
 
@@ -541,7 +541,34 @@ public class NoticeServiceImpl implements INoticeService {
 
     @Override
     public AjaxResult deleteinform(Long id, HttpServletRequest request) {
-        iSiteColumndetailMapper.delete(new QueryWrapper<SiteColumndetail>().eq("id",id));
+        iSiteColumndetailMapper.delete(new QueryWrapper<SiteColumndetail>().eq("id", id));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult noticemsgedit(NoticeMsgAddParam addParam, HttpServletRequest request) throws ParseException {
+        Noticemsg oldNoticeMsg = iNoticemsgMapper.selectOne(new QueryWrapper<Noticemsg>().eq("AUTOID", addParam.getAutoid()));
+        oldNoticeMsg.setTitle(addParam.getTitle());
+        oldNoticeMsg.setContent(addParam.getContent());
+        oldNoticeMsg.setEndtime(DateTimeUtils.parseDate(addParam.getEndtime()));
+        oldNoticeMsg.setScheduletime(DateTimeUtils.parseDate(addParam.getScheduletime()));
+        iNoticemsgMapper.updateById(oldNoticeMsg);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult invalid(Long auditid, HttpServletRequest request) {
+        Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Noticemsg msg = iNoticemsgMapper.selectOne(new QueryWrapper<Noticemsg>().eq("AUTOID",auditid));
+        if (msg != null){
+            // 3:提前失效
+            Integer oldValue = msg.getSentstatus();
+            msg.setSentstatus(3);
+            iNoticemsgMapper.updateById(msg);
+
+            //写操作日志
+            systemmanagerService.writeOperateLog(SysConstants.NOTICEMSG_MANAGE, "提前失效公告：" + auditid.toString(), user, "公告标题【" + msg.getTitle() + "】", oldValue.toString() , "3");
+        }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
@@ -617,18 +644,18 @@ public class NoticeServiceImpl implements INoticeService {
     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();
+        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")){
+            while (desString.endsWith("\n")) {
                 desString = desString.substring(0, desString.length() - 1).trim();
             }
 
             //删除最后的ignorStr
-            while (desString.endsWith(ignorStr)){
+            while (desString.endsWith(ignorStr)) {
                 desString = desString.substring(0, desString.length() - ignorStr.length()).trim();
             }
 

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

@@ -2,38 +2,52 @@ 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.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muchinfo.mtp3century.service.ICommonService;
 import com.muchinfo.mtp3century.service.ISystemSetUpService;
 import com.muchinfo.mtp3century.utils.AjaxResult;
-import com.muchinfo.mtp3common.enumtype.Constants;
-import com.muchinfo.mtp3common.enumtype.MessageType;
+import com.muchinfo.mtp3century.utils.RedisServiceUtil;
+import com.muchinfo.mtp3common.enumtype.*;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3interface.mapper.IErrorcodeMapper;
 import com.muchinfo.mtp3interface.mapper.ISystemmanagerMapper;
 import com.muchinfo.mtp3interface.mapper.ISystemparamMapper;
+import com.muchinfo.mtp3pojos.entity.Errorcode;
 import com.muchinfo.mtp3pojos.entity.Systemmanager;
 import com.muchinfo.mtp3pojos.entity.Systemparam;
+import com.muchinfo.mtp3pojos.vo.systemsetup.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-@Service
+import java.util.Date;
+import java.util.Objects;
 
+@Service
 public class SystemSetUpServiceImpl implements ISystemSetUpService {
-
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
     @Resource
     private ISystemmanagerMapper iSystemmanagerMapper;
     @Resource
     private ICommonService iCommonService;
     @Resource
     private ISystemparamMapper iSystemparamMapper;
+    @Resource
+    private RedisServiceUtil redisServiceUtil;
+    @Resource
+    private IErrorcodeMapper iErrorcodeMapper;
+
     @Override
     public PageResult<Systemparam> queryByPage(Integer pageNum, Integer pageSize, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         IPage<Systemparam> page = new Page<>(pageNum, pageSize);
         QueryWrapper<Systemparam> wrapper = new QueryWrapper<>();
-        if(systemmanager.getAutoid() > 0){
-            wrapper.eq("showflag",1);
+        if (systemmanager.getAutoid() > 0) {
+            wrapper.eq("showflag", 1);
         }
         IPage<Systemparam> queryResultIPage = iSystemparamMapper.selectPage(page, wrapper);
         PageResult<Systemparam> result = new PageResult<>();
@@ -46,4 +60,160 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
         result.setData(queryResultIPage.getRecords());
         return result;
     }
+
+    @Override
+    public AjaxResult dealParam(SystemParamUpdate sysparm, HttpServletRequest request) {
+
+        log.debug("sysparam_code={},sysparam_value={}", sysparm.getParaCode(), sysparm.getParaValue());
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (systemmanager.getReletype() != 1) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
+        }
+        Systemparam old = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", sysparm.getParaCode()));
+        // 修改系统参数
+        if (sysparm.getStatus() == 1) {
+            updateSysParam(sysparm, systemmanager, old);
+        } else {
+            // 新增或修改终端参数
+            if (Objects.isNull(old)) addTerminalSysParam(sysparm, systemmanager);
+            else updateTerminalSysParam(sysparm, systemmanager, old);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<Errorcode> queryErr(SystemErrorCodeParam param, HttpServletRequest request) {
+        IPage<Errorcode> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<Errorcode> queryResultIPage = iErrorcodeMapper.selectPage(page, new QueryWrapper<Errorcode>()
+                .eq(StringUtils.isNotBlank(param.getErrorid()), "ERRORID", param.getErrorid())
+                .like(StringUtils.isNotBlank(param.getErrorcode()), "ERRORCODE", param.getErrorcode())
+                .like(StringUtils.isNotBlank(param.getDescription()), "DESCRIPTION", param.getDescription()));
+        PageResult<Errorcode> 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 dealErr(SystemErrorCodeParam param, HttpServletRequest request) {
+        Errorcode entity = iErrorcodeMapper.selectOne(new QueryWrapper<Errorcode>().eq("ERRORID", param.getErrorid()));
+        entity.setDescription(param.getDescription());
+        iErrorcodeMapper.update(entity, new QueryWrapper<Errorcode>().eq("ERRORID", param.getErrorid()));
+        Systemparam sp = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", SysConstants.SYSPARAM_ERRORCODE));
+        if (Objects.nonNull(sp)) {
+            sp.setParamvalue(String.valueOf(System.currentTimeMillis()));
+            sp.setUpdatetime(new Date());
+            iSystemparamMapper.update(sp, new QueryWrapper<Systemparam>().eq("PARAMCODE", SysConstants.SYSPARAM_ERRORCODE));
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<SystemMarketSectionResult> queryMarketSet(SystemMarketSectionParam param, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        IPage<SystemMarketSectionResult> page = new Page<>(pageNum, pageSize);
+        IPage<SystemMarketSectionResult> resultIPage = iSystemmanagerMapper.queryMarketSet(page, param);
+        PageResult<SystemMarketSectionResult> pageResult = new PageResult<>();
+        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<SystemMarketSetDetail> marketSetDetail(SystemErrorCodeParam param, HttpServletRequest request) {
+        
+        return null;
+    }
+
+    private void updateTerminalSysParam(SystemParamUpdate sysparm, Systemmanager systemmanager, Systemparam old) {
+        // 修改
+        old.setRemark(sysparm.getRemark());
+        if (sysparm.getParamValue2() != null && !sysparm.getParamValue2().isEmpty()) {
+            old.setParamvalue2(sysparm.getParamValue2());
+        }
+        old.setParamvalue(sysparm.getParaValue());
+
+        old.setParamname(sysparm.getParaName());
+        old.setLoginid(systemmanager.getLogincode());
+        old.setUserid(systemmanager.getAutoid());
+        old.setUpdatetime(new Date());
+        iSystemparamMapper.update(old, new QueryWrapper<Systemparam>().eq("PARAMCODE", old.getParamcode()));
+        redisServiceUtil.updateHash(Constants.REDIS_HEADER_SYSPARAM, old.getParamcode().trim(), old.getParamvalue().trim());
+
+        if (old.getParamtype() == 0 || old.getParamtype() == 2) {
+            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", p.getParamcode()));
+            }
+        }
+
+        //修改了风险协议书的内容，更新时间戳
+        if ("099".equals(sysparm.getParaCode())) {
+            Systemparam p = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_ID_FENGX));
+
+            if (p != null) {
+                if (sysparm.getParamValue2() != null && !sysparm.getParamValue2().isEmpty()) {
+                    p.setParamvalue2(sysparm.getParamValue2());
+                }
+                p.setParamvalue(String.valueOf(System.currentTimeMillis()));
+                p.setUpdatetime(new Date());
+                iSystemparamMapper.update(p, new QueryWrapper<Systemparam>().eq("PARAMCODE", p.getParamcode()));
+            }
+        }
+    }
+
+    private void addTerminalSysParam(SystemParamUpdate sysparm, Systemmanager systemmanager) {
+        // 新增终端参数
+        Systemparam systemparam = new Systemparam();
+        BeanUtils.copyProperties(sysparm, systemparam);
+        systemparam.setModifyflag(1);
+        systemparam.setShowflag(1);
+        systemparam.setParamtype(2);
+        systemparam.setLoginid(systemmanager.getLogincode());
+        systemparam.setUserid(systemmanager.getAutoid());
+
+        systemparam.setParamvalue(sysparm.getParaValue());
+
+        systemparam.setUpdatetime(new Date());
+        iSystemparamMapper.insert(systemparam);
+        redisServiceUtil.updateHash(Constants.REDIS_HEADER_SYSPARAM, sysparm.getParaCode().trim(), sysparm.getParaValue().trim());
+
+        Systemparam p = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_ID_CONFIG));
+        if (p != null) {
+            p.setParamvalue(String.valueOf(System.currentTimeMillis()));
+            if (sysparm.getParamValue2() != null && !sysparm.getParamValue2().isEmpty()) {
+                p.setParamvalue2(sysparm.getParamValue2());
+            }
+            p.setUpdatetime(new Date());
+            iSystemparamMapper.update(p, new QueryWrapper<Systemparam>().eq("PARAMCODE", p.getParamcode()));
+        }
+    }
+
+    private void updateSysParam(SystemParamUpdate sysparm, Systemmanager systemmanager, Systemparam old) {
+        if (old != null) {
+            // 修改
+            old.setParamvalue(sysparm.getParaValue());
+            old.setRemark(sysparm.getRemark());
+            if (sysparm.getParamValue2() != null && !sysparm.getParamValue2().isEmpty()) {
+                old.setParamvalue2(sysparm.getParamValue2());
+            }
+            old.setLoginid(systemmanager.getLogincode());
+            old.setUserid(systemmanager.getAutoid());
+            old.setUpdatetime(new Date());
+            iSystemparamMapper.update(old, new QueryWrapper<Systemparam>().eq("PARAMCODE", old.getParamcode()));
+            redisServiceUtil.updateHash(Constants.REDIS_HEADER_SYSPARAM, old.getParamcode().trim(), old.getParamvalue().trim());
+        }
+    }
 }

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

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

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

@@ -100,9 +100,6 @@
     <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>

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

@@ -311,4 +311,25 @@
         </where>
         order by t.operatetime desc
     </select>
+    <select id="queryMarketSet" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.SystemMarketSectionResult">
+        select
+        m.marketsectionid,m.marketsectionname,
+        (select count(1) from  MarketSectionConfig mc where mc.marketsectionid = m.marketsectionid)  totalchild,
+        m.orderindex ,to_char(m.modifytime,'yyyy-MM-dd hh24:mi:ss') modifytimestr,
+        decode(m.modifiersrc,1,s.username,ui.customername) modifiername
+        from MarketSection m
+        left join systemmanager s on m.modifierid = s.autoid
+        left join loginaccount la on m.modifierid = la.loginid
+        left join userinfo ui on la.userid = ui.userid
+        <where>
+            m.isvalid ='1'
+            <if test="vo.marketsectionid!=null and vo.marketsectionid!=''">
+                and  m.marketsectionid = #{vo.marketsectionid }
+            </if>
+            <if test="vo.marketsectionname!=null and vo.marketsectionname!=''">
+                and m.marketsectionname like '%'||#{vo.marketsectionname }||'%'
+            </if>
+        </where>
+        order by m.orderindex
+    </select>
 </mapper>

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

@@ -2129,7 +2129,9 @@
         t.canceldeliverylot "canceldeliverylot",
         nvl(t.deliverytotalamount, 0) - nvl(t.payedamount, 0) "remainamount",
         t.realdeliveryqty "realdeliveryqty",
-        t.realdeliveryqty * t.deliverypremium "realdeliverytotalpremium"
+        t.realdeliveryqty * t.deliverypremium "realdeliverytotalpremium",
+        t.totalpricemove "totalpricemove", t.totalshippingfee "totalshippingfee",
+        t.totalotherfee "totalotherfee"
         from Trade_GoodsDeliveryOffLine t
         left join useraccount ua on t.userid = ua.userid
         left join useraccount ua2 on t.matchuserid = ua2.userid

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

@@ -8,6 +8,8 @@ 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.systemrun.*;
+import com.muchinfo.mtp3pojos.vo.systemsetup.SystemMarketSectionParam;
+import com.muchinfo.mtp3pojos.vo.systemsetup.SystemMarketSectionResult;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserReqParam;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserResResult;
 import org.apache.ibatis.annotations.Mapper;
@@ -48,5 +50,7 @@ public interface ISystemmanagerMapper extends BaseMapper<Systemmanager> {
 
     IPage<LoginLogQueryResult> queryloginlog(IPage<LoginLogQueryResult> page, @Param("vo") LoginLogQueryParam param);
 
-    List<LoginLogQueryResult> queryloginlog( @Param("vo") LoginLogQueryParam param);
+    List<LoginLogQueryResult> queryloginlog(@Param("vo") LoginLogQueryParam param);
+
+    IPage<SystemMarketSectionResult> queryMarketSet(IPage<SystemMarketSectionResult> page, @Param("vo") SystemMarketSectionParam param);
 }

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

@@ -64,7 +64,7 @@ public class Systemparam extends Model<Systemparam> {
 
     @ApiModelProperty(value = "更新用户ID")
     @TableField("USERID")
-    private BigDecimal userid;
+    private Long userid;
 
     @ApiModelProperty(value = "更新用户账号,登录账号")
     @TableField("LOGINID")

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

@@ -33,5 +33,5 @@ public class ColumnQueryResult {
 
     private Long creatorid;
 
-    private String id;
+    private Long id;
 }

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

@@ -23,5 +23,5 @@ public class ColumnSourceQueryResult {
     @ApiModelProperty(value = "来源网址")
     private String membertags;
 
-    private String memberid;
+    private Long memberid;
 }

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

@@ -16,6 +16,8 @@ import java.util.List;
 @ApiModel(value = "NoticeMsgAddParam对象", description = "发布通知公告")
 public class NoticeMsgAddParam {
 
+    private Long autoid;
+
     @ApiModelProperty(value = "标题")
     private String title;
 

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/OfflineDeliveryDetailResult.java

@@ -32,7 +32,7 @@ public class OfflineDeliveryDetailResult {
     @ApiModelProperty(value = "申请交收数量")
     private Integer deliveryqty;
 
-    private String goodunitid;
+    private Integer goodunitid;
 
     @ApiModelProperty(value = "实际交收数量")
     private Integer sucdeliveryqty;
@@ -66,4 +66,13 @@ public class OfflineDeliveryDetailResult {
 
     @ApiModelProperty(value = "完成时间")
     private Date closetime;
+
+    @ApiModelProperty(value = "总升贴水")
+    private BigDecimal totalpricemove;
+
+    @ApiModelProperty(value = "总运费")
+    private BigDecimal totalshippingfee;
+
+    @ApiModelProperty(value = "总其它费用")
+    private BigDecimal totalotherfee;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/SystemErrorCodeParam.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 = "SystemErrorCodeParam对象", description = "错误码")
+public class SystemErrorCodeParam {
+
+    @ApiModelProperty(value = "错误号")
+    private String errorid;
+
+    @ApiModelProperty(value = "错误代码")
+    private String errorcode;
+
+    @ApiModelProperty(value = "错误描述")
+    private String description;
+
+    @ApiModelProperty(value = "* 页码 *")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "* 页大小 *")
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/SystemErrorCodeUpdate.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 = "SystemErrorCodeUpdate对象", description = "修改错误码")
+public class SystemErrorCodeUpdate {
+
+    @ApiModelProperty(value = "错误号")
+    private String errorid;
+
+    @ApiModelProperty(value = "错误描述")
+    private String description;
+}

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

@@ -0,0 +1,19 @@
+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 = "SystemMarketSectionParam对象", description = "市场板块设置")
+public class SystemMarketSectionParam {
+
+    private Long marketsectionid;
+
+    private String marketsectionname;
+}

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

@@ -0,0 +1,32 @@
+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;
+
+import java.util.Date;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "SystemMarketSectionResult对象", description = "市场板块设置响应")
+public class SystemMarketSectionResult {
+
+    private Long marketsectionid;
+
+    @ApiModelProperty(value = "板块名称")
+    private String marketsectionname;
+
+    @ApiModelProperty(value = "显示排序")
+    private Integer orderindex;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifytimestr;
+
+    @ApiModelProperty(value = "操作人")
+    private String modifiername;
+}

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

@@ -0,0 +1,17 @@
+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 = "SystemMarketSetDetail对象", description = "市场板块设置详情")
+public class SystemMarketSetDetail {
+
+    private Long id;
+}

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

@@ -0,0 +1,32 @@
+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 = "SystemParamUpdate对象", description = "修改系统参数")
+public class SystemParamUpdate {
+
+    private Integer status;
+
+    @ApiModelProperty(value = "参数代码")
+    private String paraCode;
+
+    @ApiModelProperty(value = "参数名称")
+    private String paraName;
+
+    @ApiModelProperty(value = "参数值")
+    private String paraValue;
+
+    private String paramValue2;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}