更改bug

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

@@ -216,8 +216,14 @@ public class NoticeController {
     @ApiOperation("通知公告-->资讯管理-->新增/修改")
     @RequestMapping(method = RequestMethod.POST, value = "/dealinform")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult dealinform(@RequestBody SiteColumndetail param, HttpServletRequest request) {
-        return iNoticeService.dealinform(param, request);
+    private AjaxResult dealinform(@RequestBody String param, HttpServletRequest request) {
+        try {
+            SiteColumndetail addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), SiteColumndetail.class);
+            return iNoticeService.dealinform(addParam, request);
+        } catch (Exception e) {
+            log.error("资讯管理新增/修改，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("通知公告-->资讯管理-->审核")

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

@@ -12,6 +12,7 @@ import com.muchinfo.mtp3century.service.ISendMsgService;
 import com.muchinfo.mtp3century.utils.RedisServiceUtil;
 import com.muchinfo.mtp3common.enumtype.*;
 import com.muchinfo.mtp3century.utils.AjaxResult;
+import com.muchinfo.mtp3common.utils.DateTimeUtils;
 import com.muchinfo.mtp3common.utils.JwtUtil;
 import com.muchinfo.mtp3interface.mapper.*;
 import com.muchinfo.mtp3pojos.entity.*;
@@ -139,7 +140,7 @@ public class CommonServiceImpl implements ICommonService {
         WskhOpenaccountconfig configtype = iWskhOpenaccountconfigMapper.selectOne(new QueryWrapper<WskhOpenaccountconfig>().eq("CONFIGTYPE", 6));
         List<FileMetaVo> res = new ArrayList<>();
 
-        String getImagePath = configtype.getConfigvalue() + "/uploadFile/";
+        String getImagePath = configtype.getConfigvalue() + "/uploadFile/" + DateTimeUtils.formatChar(new Date(), null) + "/";
         File file = new File(getImagePath);
         if (!file.exists()) {
             file.mkdirs();
@@ -167,7 +168,7 @@ public class CommonServiceImpl implements ICommonService {
                     meta.setFileSize(item.getSize() / 1024 + "KB");
                     meta.setFileType(item.getContentType());
 
-                    meta.setFilePath("./image/" + fileName);
+                    meta.setFilePath("./image/" + DateTimeUtils.formatChar(new Date(), null) + "/" + fileName);
                     res.add(meta);
                 }
             }
@@ -779,7 +780,7 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public AjaxResult<Userinfo>  queryUserinfoUserId(Long userid, HttpServletRequest request) {
+    public AjaxResult<Userinfo> queryUserinfoUserId(Long userid, HttpServletRequest request) {
         Userinfo userinfo = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", userid));
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), userinfo);
     }

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

@@ -456,7 +456,9 @@ public class NoticeServiceImpl implements INoticeService {
     public AjaxResult<SiteColumndetail> informDetail(Long id, HttpServletRequest request) {
         SiteColumndetail siteColumndetail = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id", id));
         siteColumndetail.setColumnname(iSiteColumnconfigMapper.selectOne(new QueryWrapper<SiteColumnconfig>().eq("id", siteColumndetail.getColumnid())).getColumnname());
-        siteColumndetail.setSrcname(iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", siteColumndetail.getSrcid())).getMembername());
+        if(siteColumndetail.getSrcid() != null){
+            siteColumndetail.setSrcname(iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", siteColumndetail.getSrcid())).getMembername());
+        }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), siteColumndetail);
     }
 
@@ -473,6 +475,7 @@ public class NoticeServiceImpl implements INoticeService {
         Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         if (param.getId() == null) {
             SiteColumndetail config = new SiteColumndetail();
+            BeanUtils.copyProperties(param, config);
             try {
                 if (StringUtils.isNotBlank(param.getPublishdate2())) {
                     config.setPublishdate(DateTimeUtils.parseDate(config.getPublishdate2(),
@@ -559,15 +562,15 @@ public class NoticeServiceImpl implements INoticeService {
     @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){
+        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");
+            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"));
     }