智库标签

pom.xml

@@ -64,7 +64,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <!-- 动态数据源 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>2.5.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.17</version>
+        </dependency>
         <!-- hutool工具类-->
         <dependency>
             <groupId>cn.hutool</groupId>

src/main/java/com/zzsn/thinktank/controller/SysDictItemController.java

+package com.zzsn.thinktank.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsn.thinktank.entity.SysDictItem;
+import com.zzsn.thinktank.service.ISysDictItemService;
+import com.zzsn.thinktank.vo.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@RestController
+@RequestMapping("/sys/dictItem")
+@Slf4j
+public class SysDictItemController {
+
+	@Autowired
+	private ISysDictItemService sysDictItemService;
+	
+	/**
+	 * @功能：查询字典数据
+	 * @param sysDictItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@PostMapping(value = "/remoteList")
+	public Result<IPage<SysDictItem>> remoteList(@RequestBody SysDictItem sysDictItem,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
+		Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
+		LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>()
+				.eq(null != sysDictItem.getStatus(), SysDictItem::getStatus, sysDictItem.getStatus())
+				.eq(null != sysDictItem.getDictId(), SysDictItem::getDictId, sysDictItem.getDictId())
+				.like(null != sysDictItem.getItemText(), SysDictItem::getItemText, sysDictItem.getItemText());
+		Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
+		IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+}

src/main/java/com/zzsn/thinktank/controller/ThinktankBasicInfoController.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/zzsn/thinktank/entity/SysDictItem.java

+package com.zzsn.thinktank.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysDictItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 字典id
+     */
+    private String dictId;
+
+    /**
+     * 字典项文本
+     */
+    @Excel(name = "字典项文本", width = 20)
+    private String itemText;
+
+    /**
+     * 字典项值
+     */
+    @Excel(name = "字典项值", width = 30)
+    private String itemValue;
+
+    /**
+     * 描述
+     */
+    @Excel(name = "描述", width = 40)
+    private String description;
+
+    /**
+     * 排序
+     */
+    @Excel(name = "排序", width = 15,type=4)
+    private Integer sortOrder;
+
+
+    /**
+     * 状态（1启用 0不启用）
+     */
+    private Integer status;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+
+}

src/main/java/com/zzsn/thinktank/entity/ThinktankBasicInfo.java

@@ -107,7 +107,8 @@ public class ThinktankBasicInfo extends Model<ThinktankBasicInfo> {
   private String achievementType;
   //资金来源
   private String fundsSource;
-
+  //语言中文名称
+  private String langName;
   public List<String> toList(){
     List<String> list = new ArrayList<>();
     list.add(getValue(id));

src/main/java/com/zzsn/thinktank/mapper/SysDictItemMapper.java

+package com.zzsn.thinktank.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsn.thinktank.entity.SysDictItem;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
+}

src/main/java/com/zzsn/thinktank/service/ISysDictItemService.java

+package com.zzsn.thinktank.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsn.thinktank.entity.SysDictItem;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+public interface ISysDictItemService extends IService<SysDictItem> {
+}

src/main/java/com/zzsn/thinktank/service/ThinktankBasicInfoService.java

@@ -11,6 +11,7 @@ import com.zzsn.thinktank.vo.ThinktankInfoVo;
 import org.springframework.web.multipart.MultipartFile;
 import com.zzsn.thinktank.vo.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;

src/main/java/com/zzsn/thinktank/service/impl/SysDictItemServiceImpl.java

+package com.zzsn.thinktank.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.thinktank.entity.SysDictItem;
+import com.zzsn.thinktank.mapper.SysDictItemMapper;
+import com.zzsn.thinktank.service.ISysDictItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@DS("slave")
+@Service
+public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements ISysDictItemService {
+
+    @Autowired
+    private SysDictItemMapper sysDictItemMapper;
+
+}

src/main/java/com/zzsn/thinktank/vo/ThinktankBasicInfoListVo.java

@@ -49,4 +49,16 @@ public class ThinktankBasicInfoListVo {
     private List<String> regionalCountriesTypeId;
     //领域标签id
     private List<String> fieldTypeId;
+    //语言
+    private List<String> langList;
+    //智库性质
+    private List<String> natureList;
+    //影响力和地位
+    private List<String> influencePositionList;
+    //智库规模
+    private List<String> scaleList;
+    //人员规模
+    private List<String> staffSizeList;
+    //运营状态
+    private List<String> operateStatusList;
 }

src/main/resources/application.yml

@@ -9,11 +9,43 @@ spring:
       max-file-size: 100MB
       #总上传文件大小
       max-request-size: 1000MB
-
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://114.116.44.11:3306/clb_project?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
-    username: ciglobal
-    password: qwer@9988&zzsn
+    dynamic:
+      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initial-size: 10
+        min-idle: 5
+        maxActive: 30
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat
+      primary: master
+      datasource:
+        master:
+          url: jdbc:mysql://114.116.44.11:3306/clb_project?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false&allowMultiQueries=true
+          username: ciglobal
+          password: qwer@9988&zzsn
+          driver-class-name: com.mysql.jdbc.Driver
+        slave:
+          url: jdbc:mysql://114.116.44.11:3306/clb_system?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false
+          username: ciglobal
+          password: qwer@9988&zzsn
+          driver-class-name: com.mysql.jdbc.Driver
   redis:
     database: 0
     host: 114.116.90.53