bugifx

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -32,8 +32,8 @@ public class RuoYiApplication
         path = path.isEmpty() ? "" : path;
         System.out.println("\n----------------------------------------------------------\n\t"
                 + "Application is running! Access URLs:\n\t"
-                + "swagger-ui: http://localhost:" + port + path + "doc.html\n\t"
-                + "swagger-ui: http://" + ip + ":" + port + path + "doc.html\n\t"
+                + "swagger-ui: http://localhost:" + port + path + "/doc.html\n\t"
+                + "swagger-ui: http://" + ip + ":" + port + path + "/doc.html\n\t"
                 + "----------------------------------------------------------");
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java

@@ -4,15 +4,20 @@ package com.ruoyi.gysl.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.gysl.entity.Xmzsk;
 import com.ruoyi.gysl.entity.request.XmzskPageReq;
 import com.ruoyi.gysl.service.XmzskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.io.Serializable;
 import java.util.List;
 
@@ -92,5 +97,49 @@ public class XmzskController extends BaseController {
     public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
         return success(xmzskService.removeByIds(idList));
     }
+
+    /**
+     * 导出项目数据
+     */
+//    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @ApiOperation("导出项目数据")
+    @PostMapping("/exportInfo")
+    public void exportInfo(HttpServletResponse response,XmzskPageReq req) {
+        List<Xmzsk> pE = xmzskService.page(req);
+        ExcelUtil<Xmzsk> util = new ExcelUtil<>(Xmzsk.class);
+        util.exportExcel(response, pE, "项目知识库数据");
+    }
+
+
+
+    /**
+     * 模板信息
+     */
+    @ApiOperation("导出基本信息模板")
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<Xmzsk> util = new ExcelUtil<>(Xmzsk.class);
+        util.importTemplateExcel(response, "项目知识库数据");
+    }
+
+    /**
+     * 项目知识库信息批量导入
+     */
+    @ApiOperation(value = "项目知识库信息批量导入")
+//    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @PostMapping(value = "/import", consumes = "multipart/form-data")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelUtil<Xmzsk> util = new ExcelUtil<>(Xmzsk.class);
+        List<Xmzsk> proList = util.importExcel(file.getInputStream());
+        StringBuilder successMsg = new StringBuilder();
+        if (proList == null || proList.isEmpty()) {
+            throw new ServiceException("项目知识库导入数据不能为空");
+        } else {
+            xmzskService.saveBatch(proList);
+            successMsg.append("导入成功");
+        }
+        return AjaxResult.success(successMsg);
+    }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java

@@ -7,6 +7,7 @@ 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.ruoyi.common.annotation.Excel;
 import com.ruoyi.gysl.entity.baseModel.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,12 +39,14 @@ public class Xmzsk extends BaseModel implements Serializable {
      */
     @ApiModelProperty(value = "文件名称")
     @TableField("name")
+    @Excel(name = "文件名称")
     private String name;
 
     /**
      * 类型
      */
     @ApiModelProperty(value = "类型")
+    @Excel(name = "文件名称")
     @TableField("lx")
     private String lx;
 
@@ -51,6 +54,7 @@ public class Xmzsk extends BaseModel implements Serializable {
      * 网址
      */
     @ApiModelProperty(value = "网址")
+    @Excel(name = "网址")
     @TableField("wz")
     private String wz;
 
@@ -66,6 +70,7 @@ public class Xmzsk extends BaseModel implements Serializable {
      */
     @ApiModelProperty(value = "上传用户")
     @TableField("scyh")
+    @Excel(name = "上传用户")
     private String scyh;
 
     /**
@@ -73,6 +78,7 @@ public class Xmzsk extends BaseModel implements Serializable {
      */
     @ApiModelProperty(value = "上传时间")
     @TableField("scsj")
+    @Excel(name = "上传时间")
     private Date scsj;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java

@@ -31,6 +31,8 @@ public interface BasicInformationMapper extends BaseMapper<BasicInformation> {
      * @return 所有数据
      */
     Page<BasicInformation> page(Page<BasicInformation> page, @Param("req") BasicInformationPageReq req);
+
+
     /**
      * 有经纬度的项目列表
      */

ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java

@@ -6,6 +6,8 @@ import com.ruoyi.gysl.entity.Xmzsk;
 import com.ruoyi.gysl.entity.request.XmzskPageReq;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * (Xmzsk)表数据库访问层
  *
@@ -22,5 +24,6 @@ public interface XmzskMapper extends BaseMapper<Xmzsk> {
      * @return 所有数据
      */
     Page<Xmzsk> page(Page<Xmzsk> page,@Param("req") XmzskPageReq req);
+    List<Xmzsk> page( @Param("req") XmzskPageReq req);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java

@@ -56,7 +56,7 @@ public class NoticeTiming {
                 "年" +
                 LocalDate.now().getMonth().getValue() +
                 "月" +
-                "项目进展未填写", null, null, null);
+                "项目进展未填写", null, null, String.valueOf(LocalDate.now().getMonth().getValue()));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.gysl.entity.Xmzsk;
 import com.ruoyi.gysl.entity.request.XmzskPageReq;
 
+import java.util.List;
+
 /**
  * (Xmzsk)表服务接口
  *
@@ -20,5 +22,6 @@ public interface XmzskService extends IService<Xmzsk> {
      * @return 所有数据
      */
     Page<Xmzsk> page(Page<Xmzsk> page, XmzskPageReq req);
+    List<Xmzsk> page(XmzskPageReq req);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java

@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -190,12 +191,13 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
 
         if (status == 2) {
             if (oldStatus == 1) {
-                userService.getAllZwUser("关于" + req.getBasicInformation().getName() + "项目,待审核的通知", req.getBasicInformation().getId(), null, null);
+                userService.getAllZwUser("关于" + req.getBasicInformation().getName() + "项目,待审核的通知", req.getBasicInformation().getId(), null, String.valueOf(LocalDateTime.now()));
             }
         }
         if (status == 3) {
             if (oldStatus == 2) {
                 SmartDeclaration sd = new SmartDeclaration();
+                sd.setAlertTime(LocalDateTime.now());
                 sd.setTyshxydm((req.getBasicInformation().getTyshxydm()));
                 sd.setProjectId(req.getBasicInformation().getId());
                 sd.setContent("关于" + req.getBasicInformation().getName() + "项目,审核通过的通知");

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java

@@ -8,6 +8,8 @@ import com.ruoyi.gysl.entity.Xmzsk;
 import com.ruoyi.gysl.service.XmzskService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * (Xmzsk)表服务实现类
  *
@@ -28,5 +30,10 @@ public class XmzskServiceImpl extends ServiceImpl<XmzskMapper, Xmzsk> implements
     public Page<Xmzsk> page(Page<Xmzsk> page, XmzskPageReq req) {
         return baseMapper.page(page,req);
     }
+
+    @Override
+    public List<Xmzsk> page(XmzskPageReq req) {
+        return  baseMapper.page(req);
+    }
 }
 

ruoyi-admin/src/main/resources/application-internet.yml

@@ -40,7 +40,7 @@ spring:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: true
+                enabled: false
                 url: jdbc:mysql://172.25.227.3:3306/sip_data_gdzc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: gyslgl
                 password: ryw!@63@w%4