Ver Fonte

添加工程信息,及相关的方法

cxd há 7 meses atrás
pai
commit
76d22a0c15

+ 3 - 3
gqy-admin/src/main/java/com/gqy/web/controller/document/DcDocumentController.java

@@ -27,7 +27,7 @@ import java.util.Map;
 
 
 /**
 /**
  * 【请填写功能名称】Controller
  * 【请填写功能名称】Controller
- * 
+ *
  * @author raycos
  * @author raycos
  * @date 2024-10-30
  * @date 2024-10-30
  */
  */
@@ -48,7 +48,7 @@ public class DcDocumentController extends BaseController
     @PostMapping("/create")
     @PostMapping("/create")
     @PreAuthorize("@ss.hasPermi('system:document:add')")
     @PreAuthorize("@ss.hasPermi('system:document:add')")
     @Log(title = "文档管理", businessType = BusinessType.INSERT)
     @Log(title = "文档管理", businessType = BusinessType.INSERT)
-    public AjaxResult create(HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) {
+    public AjaxResult create(@RequestBody  Map request, @RequestParam(value = "file", required = false) MultipartFile file) {
         return documentService.create(request, file);
         return documentService.create(request, file);
     }
     }
 
 
@@ -149,7 +149,7 @@ public class DcDocumentController extends BaseController
      */
      */
     @PostMapping("/info")
     @PostMapping("/info")
     public @ResponseBody  AjaxResultCQY info(@RequestBody  Map map) {
     public @ResponseBody  AjaxResultCQY info(@RequestBody  Map map) {
-        Integer id = (Integer) map.get("id");
+        String id = (String) map.get("id");
         if (id == null || "".equals(id)) {
         if (id == null || "".equals(id)) {
             return AjaxResultCQY.error("文档ID不能为空");
             return AjaxResultCQY.error("文档ID不能为空");
         }
         }

+ 17 - 0
gqy-framework/src/main/java/com/gqy/framework/config/ApplicationConfig.java

@@ -1,12 +1,29 @@
 package com.gqy.framework.config;
 package com.gqy.framework.config;
 
 
+import java.text.SimpleDateFormat;
 import java.util.TimeZone;
 import java.util.TimeZone;
+
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 
+
+import java.util.TimeZone;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+
+import java.text.SimpleDateFormat;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.deser.std.DateDeserializers.DateDeserializer;
+
 /**
 /**
  * 程序注解配置
  * 程序注解配置
  *
  *

+ 27 - 1
gqy-system/src/main/java/com/gqy/document/domain/DcTemplate.java

@@ -1,7 +1,11 @@
 package com.gqy.document.domain;
 package com.gqy.document.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.gqy.common.config.CustomDateDeserializer;
 import com.gqy.common.core.domain.BaseEntity;
 import com.gqy.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
@@ -43,8 +47,12 @@ public class DcTemplate extends BaseEntity {
     /** 用户id */
     /** 用户id */
     private Long user_id;
     private Long user_id;
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+    @JsonProperty("create_time")  // Add this annotation
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date create_time;
     private Date create_time;
+
     /**
     /**
      *  状态
      *  状态
      *      (5, "使用中"),
      *      (5, "使用中"),
@@ -59,6 +67,11 @@ public class DcTemplate extends BaseEntity {
     /** 分类名称(非数据库字段) */
     /** 分类名称(非数据库字段) */
     private String type_name;
     private String type_name;
 
 
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date createTime;
+
     public Long getUser_id() {
     public Long getUser_id() {
         return user_id;
         return user_id;
     }
     }
@@ -167,10 +180,23 @@ public class DcTemplate extends BaseEntity {
         return create_time;
         return create_time;
     }
     }
 
 
+    @JsonProperty("create_time")  // Add this annotation
     public void setCreate_time(Date create_time) {
     public void setCreate_time(Date create_time) {
         this.create_time = create_time;
         this.create_time = create_time;
     }
     }
 
 
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @JsonProperty("createTime")  // Add this annotation
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+
     public Integer getStatus() {
     public Integer getStatus() {
         return status;
         return status;
     }
     }

+ 17 - 0
gqy-system/src/main/java/com/gqy/document/service/IDcSystemService.java

@@ -0,0 +1,17 @@
+package com.gqy.document.service;
+
+import com.gqy.common.core.domain.AjaxResult;
+import com.gqy.document.domain.DcSystem;
+
+/**
+ *
+ */
+public interface IDcSystemService {
+
+    /**
+     * 新增系统配置
+     */
+    public AjaxResult insertDcSystem(DcSystem dcSystem);
+
+
+}

+ 7 - 1
gqy-system/src/main/java/com/gqy/document/service/IDocumentService.java

@@ -19,7 +19,13 @@ import java.util.Map;
  */
  */
 public interface IDocumentService
 public interface IDocumentService
 {
 {
-    public AjaxResult create(HttpServletRequest request, MultipartFile file);
+    /**
+     * 创建文档
+     * @param request
+     * @param file
+     * @return
+     */
+    public AjaxResult create(Map request, MultipartFile file);
 
 
     /**
     /**
      * 分页查询文档列表
      * 分页查询文档列表

+ 14 - 11
gqy-system/src/main/java/com/gqy/document/service/impl/DcDocumentServiceImpl.java

@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 
 
 /**
 /**
  * 【请填写功能名称】Service业务层处理
  * 【请填写功能名称】Service业务层处理
- * 
+ *
  * @author raycos
  * @author raycos
  * @date 2024-10-30
  * @date 2024-10-30
  */
  */
@@ -42,17 +42,16 @@ public class DcDocumentServiceImpl implements IDocumentService
     private ProjectDocumentMapper projectDocumentMapper;
     private ProjectDocumentMapper projectDocumentMapper;
 
 
 
 
-    @Override
+
     @Transactional
     @Transactional
-    public AjaxResult create(HttpServletRequest request, MultipartFile file) {
+    public AjaxResult create(Map request, MultipartFile file) {
         try {
         try {
             // 1. 获取表单参数
             // 1. 获取表单参数
-            String title = request.getParameter("title");
-            String data = request.getParameter("data");
-            String categoryId = request.getParameter("category_id");
-            String isTemplate = request.getParameter("is_template");
-            String status = request.getParameter("status");
-            String projects = request.getParameter("projects");
+            String title = (String) request.get("title");
+            String data = (String)request.get("data");
+            Integer isTemplate = (Integer)request.get("is_template");
+            Integer status = (Integer)request.get("status");
+            String projects = (String)request.get("projects");
 
 
             // 2. 参数校验
             // 2. 参数校验
             if (StringUtils.isEmpty(title)) {
             if (StringUtils.isEmpty(title)) {
@@ -60,10 +59,13 @@ public class DcDocumentServiceImpl implements IDocumentService
             }
             }
 
 
             Integer templateFlag = Convert.toInt(isTemplate, 0);
             Integer templateFlag = Convert.toInt(isTemplate, 0);
-            if (templateFlag == 0 && StringUtils.isEmpty(categoryId)) {
+            if (templateFlag == 0 && StringUtils.isEmpty(request.get("category_id").toString())) {
                 return AjaxResult.error("保存文档时,分类不能为空");
                 return AjaxResult.error("保存文档时,分类不能为空");
             }
             }
 
 
+            Integer categoryId = Integer.valueOf(request.get("category_id").toString());
+
+
             // 3. 检查标题是否重复
             // 3. 检查标题是否重复
             Document existDoc = documentMapper.checkDocumentTitleUnique(title, templateFlag);
             Document existDoc = documentMapper.checkDocumentTitleUnique(title, templateFlag);
             if (StringUtils.isNotNull(existDoc)) {
             if (StringUtils.isNotNull(existDoc)) {
@@ -90,7 +92,7 @@ public class DcDocumentServiceImpl implements IDocumentService
 //            document.setData(StringUtils.isNotEmpty(data) ? data : fileUrl);
 //            document.setData(StringUtils.isNotEmpty(data) ? data : fileUrl);
             document.setData(StringUtils.isNotEmpty(data) ? data : "");
             document.setData(StringUtils.isNotEmpty(data) ? data : "");
             document.setUser_id(SecurityUtils.getUserId());
             document.setUser_id(SecurityUtils.getUserId());
-            document.setCategory_id(StringUtils.isNotEmpty(categoryId) ? Long.valueOf(categoryId) : null);
+            document.setCategory_id( Long.valueOf(categoryId));
             document.setIs_template(templateFlag);
             document.setIs_template(templateFlag);
             document.setStatus(Convert.toInt(status, 5));
             document.setStatus(Convert.toInt(status, 5));
             document.setCreateTime(DateUtils.getNowDate());
             document.setCreateTime(DateUtils.getNowDate());
@@ -129,6 +131,7 @@ public class DcDocumentServiceImpl implements IDocumentService
 
 
             return AjaxResult.success("创建成功", document.getId());
             return AjaxResult.success("创建成功", document.getId());
         } catch (Exception e) {
         } catch (Exception e) {
+            e.printStackTrace();
             throw new ServiceException("创建文档失败:" + e.getMessage());
             throw new ServiceException("创建文档失败:" + e.getMessage());
         }
         }
     }
     }

+ 32 - 0
gqy-system/src/main/java/com/gqy/document/service/impl/DcSystemServiceImpl.java

@@ -0,0 +1,32 @@
+package com.gqy.document.service.impl;
+
+import com.gqy.common.core.domain.AjaxResult;
+import com.gqy.document.domain.DcSystem;
+import com.gqy.document.mapper.DcSystemMapper;
+import com.gqy.document.service.IDcSystemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Service
+public class DcSystemServiceImpl implements IDcSystemService {
+
+    private static final Logger log = LoggerFactory.getLogger(DcSystemServiceImpl.class);
+
+    @Autowired
+    DcSystemMapper dcSystemMapper;
+
+    /**
+     * 新增系统配置
+     */
+    public AjaxResult insertDcSystem(DcSystem dcSystem) {
+        try{
+            dcSystemMapper.insertDcSystem(dcSystem);
+        }catch (Exception e){
+            log.info("error===insertDcSystem",e);
+            return AjaxResult.error("系统异常");
+        }
+        return AjaxResult.success("新增系统配置成功");
+    }
+}

+ 2 - 2
gqy-system/src/main/resources/mapper/document/DcDocumentMapper.xml

@@ -100,7 +100,7 @@
         d.title,
         d.title,
         d.category_id,
         d.category_id,
         d.user_id,
         d.user_id,
-        d.create_time,
+        DATE_FORMAT(d.create_time, '%Y-%m-%d %H:%i:%s') as create_time,
         d.status,
         d.status,
         d.is_template,
         d.is_template,
         c.name as type_name,
         c.name as type_name,
@@ -239,4 +239,4 @@
         ORDER BY d.id DESC
         ORDER BY d.id DESC
     </select>
     </select>
 
 
-</mapper>
+</mapper>